You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gora.apache.org by hs...@apache.org on 2013/10/01 05:52:33 UTC
svn commit: r1527864 - in /gora/trunk: ./
gora-accumulo/src/main/java/org/apache/gora/accumulo/store/
gora-cassandra/src/main/java/org/apache/gora/cassandra/store/
gora-core/src/main/java/org/apache/gora/memory/store/
gora-core/src/main/java/org/apache...
Author: hsaputra
Date: Tue Oct 1 03:52:32 2013
New Revision: 1527864
URL: http://svn.apache.org/r1527864
Log:
GORA-270 GORA-275 Pass conf file for the IOUtils for StaticSerializationFactory | patch by drazzib
Modified:
gora/trunk/CHANGES.txt
gora/trunk/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java
gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
gora/trunk/gora-core/src/main/java/org/apache/gora/memory/store/MemStore.java
gora/trunk/gora-core/src/main/java/org/apache/gora/query/impl/PartitionQueryImpl.java
gora/trunk/gora-core/src/main/java/org/apache/gora/query/impl/QueryBase.java
gora/trunk/gora-core/src/main/java/org/apache/gora/util/IOUtils.java
gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
gora/trunk/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java
Modified: gora/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/gora/trunk/CHANGES.txt?rev=1527864&r1=1527863&r2=1527864&view=diff
==============================================================================
--- gora/trunk/CHANGES.txt (original)
+++ gora/trunk/CHANGES.txt Tue Oct 1 03:52:32 2013
@@ -4,6 +4,10 @@
Gora Change Log
+* GORA-275 Update Gora stores to pass conf when creating instance of PartitionQueryImpl (Damien Raude-Morvan via hsaputra)
+
+* GORA-270 IOUtils static SerializationFactory field (Damien Raude-Morvan via hsaputra)
+
* GORA-268 Make GoraCompiler the main manifest attribute in gora-core (Apostolos Giannakidis via lewismc)
* GORA-265 Support for dynamic file extensions when traversing a directory (Apostolos Giannakidis via lewismc)
Modified: gora/trunk/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java
URL: http://svn.apache.org/viewvc/gora/trunk/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java?rev=1527864&r1=1527863&r2=1527864&view=diff
==============================================================================
--- gora/trunk/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java (original)
+++ gora/trunk/gora-accumulo/src/main/java/org/apache/gora/accumulo/store/AccumuloStore.java Tue Oct 1 03:52:32 2013
@@ -778,6 +778,7 @@ public class AccumuloStore<K,T extends P
}
PartitionQueryImpl pqi = new PartitionQueryImpl<K,T>(query, startKey, endKey, new String[] {location});
+ pqi.setConf(getConf());
ret.add(pqi);
}
}
Modified: gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
URL: http://svn.apache.org/viewvc/gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java?rev=1527864&r1=1527863&r2=1527864&view=diff
==============================================================================
--- gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java (original)
+++ gora/trunk/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java Tue Oct 1 03:52:32 2013
@@ -292,7 +292,9 @@ public class CassandraStore<K, T extends
throws IOException {
// just a single partition
List<PartitionQuery<K,T>> partitions = new ArrayList<PartitionQuery<K,T>>();
- partitions.add(new PartitionQueryImpl<K,T>(query));
+ PartitionQueryImpl<K, T> pqi = new PartitionQueryImpl<K, T>(query);
+ pqi.setConf(getConf());
+ partitions.add(pqi);
return partitions;
}
Modified: gora/trunk/gora-core/src/main/java/org/apache/gora/memory/store/MemStore.java
URL: http://svn.apache.org/viewvc/gora/trunk/gora-core/src/main/java/org/apache/gora/memory/store/MemStore.java?rev=1527864&r1=1527863&r2=1527864&view=diff
==============================================================================
--- gora/trunk/gora-core/src/main/java/org/apache/gora/memory/store/MemStore.java (original)
+++ gora/trunk/gora-core/src/main/java/org/apache/gora/memory/store/MemStore.java Tue Oct 1 03:52:32 2013
@@ -171,7 +171,9 @@ public class MemStore<K, T extends Persi
*/
public List<PartitionQuery<K, T>> getPartitions(Query<K, T> query){
List<PartitionQuery<K, T>> list = new ArrayList<PartitionQuery<K,T>>();
- list.add(new PartitionQueryImpl<K, T>(query));
+ PartitionQueryImpl<K, T> pqi = new PartitionQueryImpl<K, T>(query);
+ pqi.setConf(getConf());
+ list.add(pqi);
return list;
}
Modified: gora/trunk/gora-core/src/main/java/org/apache/gora/query/impl/PartitionQueryImpl.java
URL: http://svn.apache.org/viewvc/gora/trunk/gora-core/src/main/java/org/apache/gora/query/impl/PartitionQueryImpl.java?rev=1527864&r1=1527863&r2=1527864&view=diff
==============================================================================
--- gora/trunk/gora-core/src/main/java/org/apache/gora/query/impl/PartitionQueryImpl.java (original)
+++ gora/trunk/gora-core/src/main/java/org/apache/gora/query/impl/PartitionQueryImpl.java Tue Oct 1 03:52:32 2013
@@ -131,7 +131,7 @@ public String[] getLocations() {
@Override
public void write(DataOutput out) throws IOException {
super.write(out);
- IOUtils.serialize(null, out, baseQuery);
+ IOUtils.serialize(getConf(), out, baseQuery);
IOUtils.writeStringArray(out, locations);
}
@@ -139,7 +139,7 @@ public String[] getLocations() {
public void readFields(DataInput in) throws IOException {
super.readFields(in);
try {
- baseQuery = IOUtils.deserialize(null, in, null);
+ baseQuery = IOUtils.deserialize(getConf(), in, null);
} catch (ClassNotFoundException ex) {
throw new IOException(ex);
}
Modified: gora/trunk/gora-core/src/main/java/org/apache/gora/query/impl/QueryBase.java
URL: http://svn.apache.org/viewvc/gora/trunk/gora-core/src/main/java/org/apache/gora/query/impl/QueryBase.java?rev=1527864&r1=1527863&r2=1527864&view=diff
==============================================================================
--- gora/trunk/gora-core/src/main/java/org/apache/gora/query/impl/QueryBase.java (original)
+++ gora/trunk/gora-core/src/main/java/org/apache/gora/query/impl/QueryBase.java Tue Oct 1 03:52:32 2013
@@ -222,9 +222,9 @@ public String[] getFields() {
if(!nullFields[1])
fields = IOUtils.readStringArray(in);
if(!nullFields[2])
- startKey = IOUtils.deserialize(null, in, null, dataStore.getKeyClass());
+ startKey = IOUtils.deserialize(getConf(), in, null, dataStore.getKeyClass());
if(!nullFields[3])
- endKey = IOUtils.deserialize(null, in, null, dataStore.getKeyClass());
+ endKey = IOUtils.deserialize(getConf(), in, null, dataStore.getKeyClass());
if(!nullFields[4])
filter = Text.readString(in);
Modified: gora/trunk/gora-core/src/main/java/org/apache/gora/util/IOUtils.java
URL: http://svn.apache.org/viewvc/gora/trunk/gora-core/src/main/java/org/apache/gora/util/IOUtils.java?rev=1527864&r1=1527863&r2=1527864&view=diff
==============================================================================
--- gora/trunk/gora-core/src/main/java/org/apache/gora/util/IOUtils.java (original)
+++ gora/trunk/gora-core/src/main/java/org/apache/gora/util/IOUtils.java Tue Oct 1 03:52:32 2013
@@ -58,20 +58,12 @@ import org.apache.hadoop.io.serializer.S
*/
public class IOUtils {
- private static SerializationFactory serializationFactory = null;
- private static Configuration conf;
-
public static final int BUFFER_SIZE = 8192;
private static BinaryDecoder decoder;
private static Configuration getOrCreateConf(Configuration conf) {
- if(conf == null) {
- if(IOUtils.conf == null) {
- IOUtils.conf = new Configuration();
- }
- }
- return conf != null ? conf : IOUtils.conf;
+ return conf != null ? conf : new Configuration();
}
public static Object readObject(DataInput in)
@@ -110,9 +102,7 @@ public class IOUtils {
public static<T> void serialize(Configuration conf, DataOutput out
, T obj, Class<T> objClass) throws IOException {
- if(serializationFactory == null) {
- serializationFactory = new SerializationFactory(getOrCreateConf(conf));
- }
+ SerializationFactory serializationFactory = new SerializationFactory(getOrCreateConf(conf));
Serializer<T> serializer = serializationFactory.getSerializer(objClass);
ByteBufferOutputStream os = new ByteBufferOutputStream();
@@ -199,9 +189,7 @@ public class IOUtils {
* @throws IOException */
public static<T> T deserialize(Configuration conf, DataInput in
, T obj , Class<T> objClass) throws IOException {
- if(serializationFactory == null) {
- serializationFactory = new SerializationFactory(getOrCreateConf(conf));
- }
+ SerializationFactory serializationFactory = new SerializationFactory(getOrCreateConf(conf));
Deserializer<T> deserializer = serializationFactory.getDeserializer(
objClass);
Modified: gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
URL: http://svn.apache.org/viewvc/gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java?rev=1527864&r1=1527863&r2=1527864&view=diff
==============================================================================
--- gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java (original)
+++ gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java Tue Oct 1 03:52:32 2013
@@ -425,8 +425,9 @@ implements Configurable {
K endKey = Arrays.equals(HConstants.EMPTY_END_ROW, splitStop) ?
null : HBaseByteInterface.fromBytes(keyClass, splitStop);
- PartitionQuery<K, T> partition = new PartitionQueryImpl<K, T>(
+ PartitionQueryImpl<K, T> partition = new PartitionQueryImpl<K, T>(
query, startKey, endKey, regionLocation);
+ partition.setConf(getConf());
partitions.add(partition);
}
Modified: gora/trunk/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java
URL: http://svn.apache.org/viewvc/gora/trunk/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java?rev=1527864&r1=1527863&r2=1527864&view=diff
==============================================================================
--- gora/trunk/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java (original)
+++ gora/trunk/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java Tue Oct 1 03:52:32 2013
@@ -471,7 +471,9 @@ public class SolrStore<K, T extends Pers
// TODO: implement this using Hadoop DB support
ArrayList<PartitionQuery<K, T>> partitions = new ArrayList<PartitionQuery<K, T>>();
- partitions.add( new PartitionQueryImpl<K, T>( query ) );
+ PartitionQueryImpl<K, T> pqi = new PartitionQueryImpl<K, T>(query);
+ pqi.setConf(getConf());
+ partitions.add(pqi);
return partitions;
}