Resource filtering by timestamp at query time - EUCA-4744

Timestamp parsing is fixed (EUCA-4743) so database filters for date properties can be enabled. EUCA-4744
eucalyptus · Jan 29, 2013 · 8d4b0d3 · 8d4b0d3
1 parent dd102a2
commit 8d4b0d3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/Snapshots.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/Snapshots.java
@@ -323,7 +323,7 @@ public SnapshotFilterSupport() {
           .withPersistenceFilter( "owner-id", "ownerAccountNumber" )
           //.withPersistenceFilter( "progress" )  //TODO:STEVE: Not working, problem with % escaping?
           .withPersistenceFilter( "snapshot-id", "displayName" )
-          //.withPersistenceFilter( "start-time", "creationTimestamp", PersistenceFilter.Type.Date ) //TODO:STEVE: Not working, fails to match due to dropped millis? (lost by timestamps parser)
+          .withPersistenceFilter( "start-time", "creationTimestamp", PersistenceFilter.Type.Date )
           .withPersistenceFilter( "volume-id", "parentVolume" )
           .withPersistenceFilter( "volume-size", "volumeSize", PersistenceFilter.Type.Integer )
       );

diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/Volumes.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/blockstorage/Volumes.java
@@ -472,7 +472,7 @@ public VolumeFilterSupport(){
 				  .withStringProperty("volume-id", FilterStringFunctions.VOLUME_ID)
 				  .withConstantProperty("volume-type", "standard")
 				  .withPersistenceFilter( "availability-zone", "partition" )
-				   //.withPersistenceFilter( "create-time", "creationTimestamp", PersistenceFilter.Type.Date ) //TODO:STEVE: Not working, fails to match due to dropped millis? (lost by timestamps parser)
+				  .withPersistenceFilter( "create-time", "creationTimestamp", PersistenceFilter.Type.Date )
 				  .withPersistenceFilter( "size", "size", PersistenceFilter.Type.Integer )
 				  .withPersistenceFilter( "snapshot-id", "parentSnapshot" )
 				  .withPersistenceFilter( "volume-id", "displayName" ) );

diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/tags/FilterSupport.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/tags/FilterSupport.java
@@ -970,7 +970,7 @@ public java.util.Date apply( final String textValue ) {
         boolean matches( final Object targetValue, final Object resourceValue ) {
           boolean match = false;
           if ( resourceValue instanceof Date && targetValue instanceof Date ) {
-            match = (((Date) resourceValue).getTime()/1000L) == (((Date) targetValue).getTime()/1000L); //TODO:STEVE: match to second only?
+            match = ((Date) resourceValue).getTime() == ((Date) targetValue).getTime();
           }
           return match;
         }

diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmInstances.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/vm/VmInstances.java
@@ -1000,7 +1000,7 @@ public VmInstanceFilterSupport() {
           .withPersistenceFilter( "instance-type", "vmType.name", Sets.newHashSet("bootRecord.vmType")  )
           .withPersistenceFilter( "kernel-id", "image.kernelId", Sets.newHashSet("bootRecord.machineImage") )
           .withPersistenceFilter( "launch-index", "launchRecord.launchIndex", Collections.<String>emptySet(), PersistenceFilter.Type.Integer )
-          //.withPersistenceFilter( "launch-time", "launchRecord.launchTime", Collections.<String>emptySet(), PersistenceFilter.Type.Date ) //TODO:STEVE: Not working, fails to match due to dropped millis? (lost by timestamps parser)
+          .withPersistenceFilter( "launch-time", "launchRecord.launchTime", Collections.<String>emptySet(), PersistenceFilter.Type.Date )
           .withPersistenceFilter( "owner-id", "ownerAccountNumber" )
           .withPersistenceFilter( "ramdisk-id", "image.ramdiskId", Sets.newHashSet("bootRecord.machineImage") )
           .withPersistenceFilter( "reservation-id", "vmId.reservationId", Collections.<String>emptySet() )
@@ -1044,9 +1044,9 @@ public VmBundleTaskFilterSupport() {
           .withPersistenceFilter( "progress", "runtimeState.bundleTask.progress", Collections.<String>emptySet(), ProgressToInteger.INSTANCE )
           .withPersistenceFilter( "s3-bucket", "runtimeState.bundleTask.bucket", Collections.<String>emptySet() )
           .withPersistenceFilter( "s3-prefix", "runtimeState.bundleTask.prefix", Collections.<String>emptySet() )
-          //.withPersistenceFilter( "start-time", "runtimeState.bundleTask.startTime", Collections.<String>emptySet(), PersistenceFilter.Type.Date ) //TODO:STEVE: Not working, fails to match due to dropped millis? (lost by timestamps parser)
+          .withPersistenceFilter( "start-time", "runtimeState.bundleTask.startTime", Collections.<String>emptySet(), PersistenceFilter.Type.Date )
           .withPersistenceFilter( "state", "runtimeState.bundleTask.state", Collections.<String>emptySet(), Enums.valueOfFunction( VmBundleTask.BundleState.class ) )
-          //.withPersistenceFilter( "update-time", "runtimeState.bundleTask.updateTime", Collections.<String>emptySet(), PersistenceFilter.Type.Date ) //TODO:STEVE: Not working, fails to match due to dropped millis? (lost by timestamps parser)
+          .withPersistenceFilter( "update-time", "runtimeState.bundleTask.updateTime", Collections.<String>emptySet(), PersistenceFilter.Type.Date )
       );
     }
   }