GEOMESA-485 Geometries are being written to the attribute index

Filter out geometry descriptors from getSecondaryIndexedAttributes

Author: Anthony Fox

geomesa-core/src/main/scala/org/locationtech/geomesa/core/data/AccumuloDataStore.scala

@@ -337,7 +337,7 @@ class AccumuloDataStore(val connector: Connector,
 
   // configure splits for each of the attribute names
   def configureAttrIdxTable(featureType: SimpleFeatureType, attributeIndexTable: String): Unit = {
-    val indexedAttrs = SimpleFeatureTypes.getIndexedAttributes(featureType)
+    val indexedAttrs = SimpleFeatureTypes.getSecondaryIndexedAttributes(featureType)
     if (!indexedAttrs.isEmpty) {
       val prefix = index.getTableSharingPrefix(featureType)
       val prefixFn = AttributeTable.getAttributeIndexRowPrefix(prefix, _: AttributeDescriptor)

geomesa-core/src/main/scala/org/locationtech/geomesa/core/data/AccumuloFeatureWriter.scala

@@ -69,7 +69,7 @@ abstract class AccumuloFeatureWriter(featureType: SimpleFeatureType,
   extends SimpleFeatureWriter
           with Logging {
 
-  val indexedAttributes = SimpleFeatureTypes.getIndexedAttributes(featureType)
+  val indexedAttributes = SimpleFeatureTypes.getSecondaryIndexedAttributes(featureType)
 
   val connector = ds.connector
 

geomesa-utils/src/main/scala/org/locationtech/geomesa/utils/geotools/SimpleFeatureTypes.scala

@@ -64,9 +64,10 @@ object SimpleFeatureTypes {
   def encodeType(sft: SimpleFeatureType): String =
     sft.getAttributeDescriptors.map { ad => AttributeSpecFactory.fromAttributeDescriptor(sft, ad).toSpec }.mkString(",")
 
-
-  def getIndexedAttributes(sft: SimpleFeatureType): Seq[AttributeDescriptor] =
-    sft.getAttributeDescriptors.filter(_.getUserData.getOrElse("index", false).asInstanceOf[java.lang.Boolean])
+  def getSecondaryIndexedAttributes(sft: SimpleFeatureType): Seq[AttributeDescriptor] =
+    sft.getAttributeDescriptors
+      .filter(_.getUserData.getOrElse("index", false).asInstanceOf[java.lang.Boolean])
+      .filterNot(_.isInstanceOf[GeometryDescriptor])
 
   object AttributeSpecFactory {
     def fromAttributeDescriptor(sft: SimpleFeatureType, ad: AttributeDescriptor) = ad.getType match {

geomesa-utils/src/test/scala/org/locationtech/geomesa/utils/geotools/SimpleFeatureTypesTest.scala

@@ -92,16 +92,15 @@ class SimpleFeatureTypesTest extends Specification {
       sft.getName.getNamespaceURI must be equalTo "foo"
     }
 
-    "return the indexed attributes" >> {
+    "return the indexed attributes (not including the default geometry)" >> {
       val sft = SimpleFeatureTypes.createType("testing", "id:Integer:index=false,dtg:Date:index=true,*geom:Point:srid=4326:index=true")
-      val indexed = SimpleFeatureTypes.getIndexedAttributes(sft)
-      indexed.map(_.getLocalName) must containTheSameElementsAs(List("dtg", "geom"))
+      val indexed = SimpleFeatureTypes.getSecondaryIndexedAttributes(sft)
+      indexed.map(_.getLocalName) must containTheSameElementsAs(List("dtg"))
     }
 
     "set index=true for a default geometry" >> {
       val sft = SimpleFeatureTypes.createType("testing", "id:Integer:index=false,dtg:Date:index=true,*geom:Point:srid=4326:index=false")
-      val indexed = SimpleFeatureTypes.getIndexedAttributes(sft).map(_.getLocalName)
-      indexed must contain("geom")
+      sft.getGeometryDescriptor.getUserData.get("index").asInstanceOf[Boolean] must beTrue
     }
 
     "handle list types" >> {