Fix issue with map serialization schema with CQL conversion.
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/builder/IdBuilder.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/builder/IdBuilder.java
index d81bd24..c2a1826 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/builder/IdBuilder.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/builder/IdBuilder.java
@@ -55,12 +55,6 @@
this.searchFilterFactory = searchFilterFactory;
}
- public IdBuilder( final Pipeline<FilterResult<Id>> pipeline, final FilterFactory filterFactory ) {
- this.pipeline = pipeline;
- this.filterFactory = filterFactory;
- this.searchFilterFactory = null;
- }
-
/**
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/builder/PipelineBuilder.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/builder/PipelineBuilder.java
index 14c94a2..f3a3523 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/builder/PipelineBuilder.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/builder/PipelineBuilder.java
@@ -106,7 +106,7 @@
public IdBuilder fromId(final Id entityId){
Pipeline<FilterResult<Id>> pipeline = new Pipeline( applicationScope, this.cursor,limit ).withFilter( filterFactory.getEntityIdFilter( entityId ) );
- return new IdBuilder( pipeline, filterFactory );
+ return new IdBuilder( pipeline, filterFactory, searchFilterFactory );
}
diff --git a/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/impl/MapSerializationImpl.java b/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/impl/MapSerializationImpl.java
index 2c77ebf64..aa938b5 100644
--- a/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/impl/MapSerializationImpl.java
+++ b/stack/corepersistence/map/src/main/java/org/apache/usergrid/persistence/map/impl/MapSerializationImpl.java
@@ -67,7 +67,7 @@
private static final Map<String, DataType.Name> MAP_KEYS_COLUMNS =
new HashMap<String, DataType.Name>() {{
put( "key", DataType.Name.BLOB );
- put( "column1", DataType.Name.BLOB );
+ put( "column1", DataType.Name.TEXT );
put( "value", DataType.Name.BLOB ); }};
private static final Map<String, String> MAP_KEYS_CLUSTERING_ORDER =
new HashMap<String, String>(){{ put( "column1", "ASC" ); }};
@@ -169,7 +169,7 @@
mapKey = QueryBuilder.insertInto(MAP_KEYS_TABLE)
.using(timeToLive)
.value("key", getMapKeyPartitionKey(scope, bucket))
- .value("column1", DataType.text().serialize(key, ProtocolVersion.NEWEST_SUPPORTED))
+ .value("column1", key)
.value("value", DataType.cboolean().serialize(true, ProtocolVersion.NEWEST_SUPPORTED));
}else{
@@ -183,7 +183,7 @@
mapKey = QueryBuilder.insertInto(MAP_KEYS_TABLE)
.value("key", getMapKeyPartitionKey(scope, bucket))
- .value("column1", DataType.text().serialize(key, ProtocolVersion.NEWEST_SUPPORTED))
+ .value("column1", key)
.value("value", DataType.cboolean().serialize(true, ProtocolVersion.NEWEST_SUPPORTED));
}
@@ -223,7 +223,7 @@
Statement mapKey;
mapKey = QueryBuilder.insertInto(MAP_KEYS_TABLE)
.value("key", getMapKeyPartitionKey(scope, bucket))
- .value("column1", DataType.text().serialize(key, ProtocolVersion.NEWEST_SUPPORTED))
+ .value("column1", key)
.value("value", DataType.serializeValue(null, ProtocolVersion.NEWEST_SUPPORTED));
session.execute(mapKey);
@@ -260,7 +260,7 @@
Statement mapKey;
mapKey = QueryBuilder.insertInto(MAP_KEYS_TABLE)
.value("key", getMapKeyPartitionKey(scope, bucket))
- .value("column1", DataType.text().serialize(key, ProtocolVersion.NEWEST_SUPPORTED))
+ .value("column1", key)
.value("value", DataType.cboolean().serialize(true, ProtocolVersion.NEWEST_SUPPORTED));
session.execute(mapKey);
@@ -357,7 +357,7 @@
while( resultIterator.hasNext() && size < limit){
size++;
- keys.add((String)DataType.text().deserialize(resultIterator.next().getBytes("column1"), ProtocolVersion.NEWEST_SUPPORTED));
+ keys.add(resultIterator.next().getString("column1"));
}
