Return-Path: X-Original-To: apmail-gora-commits-archive@www.apache.org Delivered-To: apmail-gora-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1AF931867A for ; Wed, 28 Oct 2015 14:45:03 +0000 (UTC) Received: (qmail 38003 invoked by uid 500); 28 Oct 2015 14:44:04 -0000 Delivered-To: apmail-gora-commits-archive@gora.apache.org Received: (qmail 37963 invoked by uid 500); 28 Oct 2015 14:44:04 -0000 Mailing-List: contact commits-help@gora.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@gora.apache.org Delivered-To: mailing list commits@gora.apache.org Received: (qmail 37954 invoked by uid 99); 28 Oct 2015 14:44:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Oct 2015 14:44:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8ACFFDFF67; Wed, 28 Oct 2015 14:44:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: kamaci@apache.org To: commits@gora.apache.org Message-Id: <788b47c6b45e4d8cbe0a15189c1bc3f2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: gora git commit: GORA-439 Unused method parameters are removed and API signatures made clean. Date: Wed, 28 Oct 2015 14:44:04 +0000 (UTC) Repository: gora Updated Branches: refs/heads/master 97fc0d678 -> bcee2dbc6 GORA-439 Unused method parameters are removed and API signatures made clean. Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/bcee2dbc Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/bcee2dbc Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/bcee2dbc Branch: refs/heads/master Commit: bcee2dbc6e86b3ec095dc3a24d27018e6a7366ca Parents: 97fc0d6 Author: Furkan KAMACI Authored: Thu Oct 29 07:40:44 2015 +0200 Committer: Furkan KAMACI Committed: Thu Oct 29 07:40:44 2015 +0200 ---------------------------------------------------------------------- .../cassandra/query/CassandraSuperColumn.java | 6 +- .../gora/cassandra/store/CassandraStore.java | 1 - .../org/apache/gora/compiler/GoraCompiler.java | 1 - .../gora/examples/mapreduce/QueryCounter.java | 11 ++-- .../gora/examples/mapreduce/WordCount.java | 7 +-- .../apache/gora/mapreduce/GoraInputFormat.java | 22 ++----- .../org/apache/gora/mapreduce/GoraMapper.java | 14 ++--- .../org/apache/gora/spark/GoraSparkEngine.java | 3 +- .../java/org/apache/gora/util/ByteUtils.java | 4 +- .../main/java/org/apache/gora/util/IOUtils.java | 18 +++--- .../gora/mapreduce/MapReduceTestUtils.java | 2 +- .../mapreduce/TestPersistentSerialization.java | 2 +- .../persistency/impl/TestPersistentBase.java | 2 +- .../apache/gora/store/DataStoreTestUtil.java | 33 +++++----- .../java/org/apache/gora/goraci/Verify.java | 2 +- .../apache/gora/mongodb/store/MongoMapping.java | 4 +- .../gora/mongodb/store/MongoMappingBuilder.java | 2 +- .../mongodb/filters/DefaultFactoryTest.java | 4 +- .../gora/mongodb/store/TestMongoMapping.java | 66 ++++++++++---------- .../org/apache/gora/solr/store/SolrStore.java | 9 ++- 20 files changed, 93 insertions(+), 120 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraSuperColumn.java ---------------------------------------------------------------------- diff --git a/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraSuperColumn.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraSuperColumn.java index 84848bb..2b64705 100644 --- a/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraSuperColumn.java +++ b/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraSuperColumn.java @@ -74,7 +74,7 @@ public class CassandraSuperColumn extends CassandraColumn { HColumn cc = getUnionTypeColumn(mapKey + CassandraStore.UNION_COL_SUFIX, this.hSuperColumn.getColumns()); - Integer unionIndex = getUnionIndex(mapKey.toString(), cc); + Integer unionIndex = getUnionIndex(cc); Schema realSchema = fieldSchema.getValueType().getTypes().get(unionIndex); memberValue = fromByteBuffer(realSchema, hColumn.getValue()); @@ -132,7 +132,7 @@ public class CassandraSuperColumn extends CassandraColumn { if (memberType.equals(Type.UNION)){ HColumn hc = getUnionTypeColumn(memberField.name() + CassandraStore.UNION_COL_SUFIX, this.hSuperColumn.getColumns().toArray()); - Integer unionIndex = getUnionIndex(memberField.name(),hc); + Integer unionIndex = getUnionIndex(hc); cassandraColumn.setUnionType(unionIndex); } @@ -159,7 +159,7 @@ public class CassandraSuperColumn extends CassandraColumn { return value; } - private Integer getUnionIndex(String fieldName, HColumn uc){ + private Integer getUnionIndex(HColumn uc){ Integer val = IntegerSerializer.get().fromByteBuffer(uc.getValue()); return Integer.parseInt(val.toString()); } http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java ---------------------------------------------------------------------- diff --git a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java index f13d91a..bbed362 100644 --- a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java +++ b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java @@ -22,7 +22,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java ---------------------------------------------------------------------- diff --git a/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java b/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java index a3a4797..2f0d02d 100644 --- a/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java +++ b/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java @@ -21,7 +21,6 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/QueryCounter.java ---------------------------------------------------------------------- diff --git a/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/QueryCounter.java b/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/QueryCounter.java index 8e52486..0f8119a 100644 --- a/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/QueryCounter.java +++ b/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/QueryCounter.java @@ -73,19 +73,18 @@ public class QueryCounter extends Configured implements /** * Creates and returns the {@link Job} for submitting to Hadoop mapreduce. - * @param dataStore * @param query * @return * @throws IOException */ - public Job createJob(DataStore dataStore, Query query) throws IOException { + public Job createJob(Query query) throws IOException { Job job = new Job(getConf()); job.setJobName("QueryCounter"); job.setNumReduceTasks(0); job.setJarByClass(getClass()); /* Mappers are initialized with GoraMapper.initMapper()*/ - GoraMapper.initMapperJob(job, query, dataStore, NullWritable.class + GoraMapper.initMapperJob(job, query, NullWritable.class , NullWritable.class, QueryCounterMapper.class, true); job.setOutputFormatClass(NullOutputFormat.class); @@ -96,8 +95,8 @@ public class QueryCounter extends Configured implements /** * Returns the number of results to the Query */ - public long countQuery(DataStore dataStore, Query query) throws Exception { - Job job = createJob(dataStore, query); + public long countQuery(Query query) throws Exception { + Job job = createJob(query); job.waitForCompletion(true); assert(job.isComplete()); @@ -111,7 +110,7 @@ public class QueryCounter extends Configured implements public long countQuery(DataStore dataStore) throws Exception { Query query = getQuery(dataStore); - Job job = createJob(dataStore, query); + Job job = createJob(query); job.waitForCompletion(true); assert(job.isComplete()); http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/WordCount.java ---------------------------------------------------------------------- diff --git a/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/WordCount.java b/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/WordCount.java index 90c3b43..17d5df3 100644 --- a/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/WordCount.java +++ b/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/WordCount.java @@ -99,12 +99,11 @@ public class WordCount extends Configured implements Tool { /** * Creates and returns the {@link Job} for submitting to Hadoop mapreduce. - * @param inStore * @param query * @return * @throws IOException */ - public Job createJob(DataStore inStore, Query query + public Job createJob(Query query , DataStore outStore) throws IOException { Job job = new Job(getConf()); @@ -118,7 +117,7 @@ public class WordCount extends Configured implements Tool { * obtained via Gora, any other mapper can be used, such as * Hadoop-MapReduce's WordCount.TokenizerMapper. */ - GoraMapper.initMapperJob(job, query, inStore, Text.class + GoraMapper.initMapperJob(job, query, Text.class , IntWritable.class, TokenizerMapper.class, true); /* Reducers are initialized with GoraReducer#initReducer(). @@ -136,7 +135,7 @@ public class WordCount extends Configured implements Tool { DataStore outStore) throws IOException, InterruptedException, ClassNotFoundException { Query query = inStore.newQuery(); - Job job = createJob(inStore, query, outStore); + Job job = createJob(query, outStore); return job.waitForCompletion(true) ? 0 : 1; } http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-core/src/main/java/org/apache/gora/mapreduce/GoraInputFormat.java ---------------------------------------------------------------------- diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraInputFormat.java b/gora-core/src/main/java/org/apache/gora/mapreduce/GoraInputFormat.java index 320cfe7..9c1a3c2 100644 --- a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraInputFormat.java +++ b/gora-core/src/main/java/org/apache/gora/mapreduce/GoraInputFormat.java @@ -65,8 +65,7 @@ public class GoraInputFormat private Query query; @SuppressWarnings({ "rawtypes" }) - private void setInputPath(PartitionQuery partitionQuery - , TaskAttemptContext context) throws IOException { + private void setInputPath(PartitionQuery partitionQuery) throws IOException { //if the data store is file based if(partitionQuery instanceof FileSplitPartitionQuery) { FileSplit split = ((FileSplitPartitionQuery)partitionQuery).getSplit(); @@ -83,7 +82,7 @@ public class GoraInputFormat PartitionQuery partitionQuery = (PartitionQuery) ((GoraInputSplit)split).getQuery(); - setInputPath(partitionQuery, context); + setInputPath(partitionQuery); return new GoraRecordReader<>(partitionQuery, context); } @@ -134,20 +133,7 @@ public class GoraInputFormat * @throws IOException */ public static void setInput(Job job - , Query query, boolean reuseObjects) throws IOException { - setInput(job, query, query.getDataStore(), reuseObjects); - } - - /** - * Sets the input parameters for the job - * @param job the job to set the properties for - * @param query the query to get the inputs from - * @param dataStore the datastore as the input - * @param reuseObjects whether to reuse objects in serialization - * @throws IOException - */ - public static void setInput(Job job - , Query query, DataStore dataStore, boolean reuseObjects) + , Query query, boolean reuseObjects) throws IOException { Configuration conf = job.getConfiguration(); @@ -177,6 +163,6 @@ public class GoraInputFormat DataStore store = DataStoreFactory.getDataStore(dataStoreClass , inKeyClass, inValueClass, job.getConfiguration()); - setInput(job, store.newQuery(), store, reuseObjects); + setInput(job, store.newQuery(), reuseObjects); } } http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapper.java ---------------------------------------------------------------------- diff --git a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapper.java b/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapper.java index d1ff9f3..8c62110 100644 --- a/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapper.java +++ b/gora-core/src/main/java/org/apache/gora/mapreduce/GoraMapper.java @@ -102,7 +102,6 @@ public class GoraMapper extends Mapper extends Mapper void initMapperJob( Job job, Query query, - DataStore dataStore, - Class outKeyClass, + Class outKeyClass, Class outValueClass, Class mapperClass, Class partitionerClass, boolean reuseObjects) throws IOException { //set the input via GoraInputFormat - GoraInputFormat.setInput(job, query, dataStore, reuseObjects); + GoraInputFormat.setInput(job, query, reuseObjects); job.setMapperClass(mapperClass); job.setMapOutputKeyClass(outKeyClass); @@ -148,7 +146,7 @@ public class GoraMapper extends Mapper outValueClass, Class mapperClass, boolean reuseObjects) throws IOException { - initMapperJob(job, dataStore.newQuery(), dataStore, + initMapperJob(job, dataStore.newQuery(), outKeyClass, outValueClass, mapperClass, reuseObjects); } @@ -156,7 +154,6 @@ public class GoraMapper extends Mapper extends Mapper void initMapperJob( Job job, Query query, - DataStore dataStore, - Class outKeyClass, + Class outKeyClass, Class outValueClass, Class mapperClass, boolean reuseObjects) throws IOException { - initMapperJob(job, query, dataStore, outKeyClass, outValueClass, + initMapperJob(job, query, outKeyClass, outValueClass, mapperClass, null, reuseObjects); } } http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-core/src/main/java/org/apache/gora/spark/GoraSparkEngine.java ---------------------------------------------------------------------- diff --git a/gora-core/src/main/java/org/apache/gora/spark/GoraSparkEngine.java b/gora-core/src/main/java/org/apache/gora/spark/GoraSparkEngine.java index 98dafea..add4e14 100644 --- a/gora-core/src/main/java/org/apache/gora/spark/GoraSparkEngine.java +++ b/gora-core/src/main/java/org/apache/gora/spark/GoraSparkEngine.java @@ -115,10 +115,9 @@ public class GoraSparkEngine { * Sets the output parameters for the conf that Spark will use * @param job the job to set the properties for * @param dataStore the datastore as the output - * @param reuseObjects whether to reuse objects in serialization */ public Configuration generateOutputConf(Job job, - DataStore dataStore, boolean reuseObjects) { + DataStore dataStore) { return generateOutputConf(job, dataStore.getClass(), dataStore.getKeyClass(), dataStore.getPersistentClass()); } http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-core/src/main/java/org/apache/gora/util/ByteUtils.java ---------------------------------------------------------------------- diff --git a/gora-core/src/main/java/org/apache/gora/util/ByteUtils.java b/gora-core/src/main/java/org/apache/gora/util/ByteUtils.java index a382680..53aea95 100644 --- a/gora-core/src/main/java/org/apache/gora/util/ByteUtils.java +++ b/gora-core/src/main/java/org/apache/gora/util/ByteUtils.java @@ -684,7 +684,7 @@ public class ByteUtils { case BOOLEAN: return (T)Boolean.valueOf(val[0] != 0); case RECORD: //fall case MAP: - case ARRAY: return (T)IOUtils.deserialize(val, (SpecificDatumReader)datumReader, schema, (SpecificRecord)object); + case ARRAY: return (T)IOUtils.deserialize(val, (SpecificDatumReader)datumReader, (SpecificRecord)object); default: throw new RuntimeException("Unknown type: "+type); } } @@ -705,7 +705,7 @@ public class ByteUtils { case ENUM: return new byte[] { (byte)((Enum) o).ordinal() }; case RECORD: //fall case MAP: - case ARRAY: return IOUtils.serialize((SpecificDatumWriter)datumWriter, schema, (SpecificRecord)o); + case ARRAY: return IOUtils.serialize((SpecificDatumWriter)datumWriter, (SpecificRecord)o); default: throw new RuntimeException("Unknown type: "+type); } } http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-core/src/main/java/org/apache/gora/util/IOUtils.java ---------------------------------------------------------------------- diff --git a/gora-core/src/main/java/org/apache/gora/util/IOUtils.java b/gora-core/src/main/java/org/apache/gora/util/IOUtils.java index 8d44efc..1e81e8d 100644 --- a/gora-core/src/main/java/org/apache/gora/util/IOUtils.java +++ b/gora-core/src/main/java/org/apache/gora/util/IOUtils.java @@ -151,7 +151,7 @@ public class IOUtils { * Serializes the field object using the datumWriter. */ public static void serialize(OutputStream os, - SpecificDatumWriter datumWriter, Schema schema, T object) + SpecificDatumWriter datumWriter, T object) throws IOException { BinaryEncoder encoder = EncoderFactory.get().binaryEncoder(os, null); @@ -163,7 +163,7 @@ public class IOUtils { * Serializes the field object using the datumWriter. */ public static void serialize(OutputStream os, - SpecificDatumWriter datumWriter, Schema schema, T object) + SpecificDatumWriter datumWriter, T object) throws IOException { BinaryEncoder encoder = EncoderFactory.get().binaryEncoder(os, null); @@ -175,9 +175,9 @@ public class IOUtils { * Serializes the field object using the datumWriter. */ public static byte[] serialize(SpecificDatumWriter datumWriter - , Schema schema, T object) throws IOException { + , T object) throws IOException { ByteArrayOutputStream os = new ByteArrayOutputStream(); - serialize(os, datumWriter, schema, object); + serialize(os, datumWriter, object); return os.toByteArray(); } @@ -185,9 +185,9 @@ public class IOUtils { * Serializes the field object using the datumWriter. */ public static byte[] serialize(SpecificDatumWriter datumWriter - , Schema schema, T object) throws IOException { + , T object) throws IOException { ByteArrayOutputStream os = new ByteArrayOutputStream(); - serialize(os, datumWriter, schema, object); + serialize(os, datumWriter, object); return os.toByteArray(); } @@ -257,7 +257,7 @@ public class IOUtils { * Deserializes the field object using the datumReader. */ public static T deserialize(InputStream is, - SpecificDatumReader datumReader, Schema schema, T object) + SpecificDatumReader datumReader, T object) throws IOException { decoder = DecoderFactory.get().binaryDecoder(is, decoder); return datumReader.read(object, decoder); @@ -267,7 +267,7 @@ public class IOUtils { * Deserializes the field object using the datumReader. */ public static T deserialize(byte[] bytes, - SpecificDatumReader datumReader, Schema schema, T object) + SpecificDatumReader datumReader, T object) throws IOException { decoder = DecoderFactory.get().binaryDecoder(bytes, decoder); return datumReader.read(object, decoder); @@ -277,7 +277,7 @@ public class IOUtils { * Deserializes the field object using the datumReader. */ public static T deserialize(byte[] bytes, - SpecificDatumReader datumReader, Schema schema, T object) + SpecificDatumReader datumReader, T object) throws IOException { decoder = DecoderFactory.get().binaryDecoder(bytes, decoder); return datumReader.read(object, decoder); http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-core/src/test/java/org/apache/gora/mapreduce/MapReduceTestUtils.java ---------------------------------------------------------------------- diff --git a/gora-core/src/test/java/org/apache/gora/mapreduce/MapReduceTestUtils.java b/gora-core/src/test/java/org/apache/gora/mapreduce/MapReduceTestUtils.java index f75fa9e..f7a44f0 100644 --- a/gora-core/src/test/java/org/apache/gora/mapreduce/MapReduceTestUtils.java +++ b/gora-core/src/test/java/org/apache/gora/mapreduce/MapReduceTestUtils.java @@ -68,7 +68,7 @@ public class MapReduceTestUtils { //run the job log.info("running count query job"); - long result = counter.countQuery(dataStore, query); + long result = counter.countQuery(query); log.info("finished count query job"); //assert results http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-core/src/test/java/org/apache/gora/mapreduce/TestPersistentSerialization.java ---------------------------------------------------------------------- diff --git a/gora-core/src/test/java/org/apache/gora/mapreduce/TestPersistentSerialization.java b/gora-core/src/test/java/org/apache/gora/mapreduce/TestPersistentSerialization.java index 7048c0c..10c7c42 100644 --- a/gora-core/src/test/java/org/apache/gora/mapreduce/TestPersistentSerialization.java +++ b/gora-core/src/test/java/org/apache/gora/mapreduce/TestPersistentSerialization.java @@ -54,7 +54,7 @@ public class TestPersistentSerialization { MemStore store = DataStoreFactory.getDataStore( MemStore.class, String.class, Employee.class, new Configuration()); - Employee employee = DataStoreTestUtil.createEmployee(store); + Employee employee = DataStoreTestUtil.createEmployee(); TestIOUtils.testSerializeDeserialize(employee); } http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-core/src/test/java/org/apache/gora/persistency/impl/TestPersistentBase.java ---------------------------------------------------------------------- diff --git a/gora-core/src/test/java/org/apache/gora/persistency/impl/TestPersistentBase.java b/gora-core/src/test/java/org/apache/gora/persistency/impl/TestPersistentBase.java index 2f11d9f..cae635b 100644 --- a/gora-core/src/test/java/org/apache/gora/persistency/impl/TestPersistentBase.java +++ b/gora-core/src/test/java/org/apache/gora/persistency/impl/TestPersistentBase.java @@ -149,7 +149,7 @@ public class TestPersistentBase { MemStore store = DataStoreFactory.getDataStore( MemStore.class, String.class, Employee.class, new Configuration()); - Employee employee = DataStoreTestUtil.createEmployee(store); + Employee employee = DataStoreTestUtil.createEmployee(); assertEquals(employee, Employee.newBuilder(employee).build()); } http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java ---------------------------------------------------------------------- diff --git a/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java b/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java index 0d4a0e6..bbd77ed 100644 --- a/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java +++ b/gora-core/src/test/java/org/apache/gora/store/DataStoreTestUtil.java @@ -92,8 +92,7 @@ public class DataStoreTestUtil { assertFalse( obj1 == obj2 ); } - public static Employee createEmployee( - DataStore dataStore) throws Exception { + public static Employee createEmployee() throws Exception { Employee employee = Employee.newBuilder().build(); employee.setName(new Utf8("Random Joe")); @@ -103,7 +102,7 @@ public class DataStoreTestUtil { return employee; } - private static WebPage createWebPage(DataStore dataStore) { + private static WebPage createWebPage() { WebPage webpage = WebPage.newBuilder().build(); webpage.setUrl(new Utf8("url..")); webpage.setContent(ByteBuffer.wrap("test content".getBytes(Charset.defaultCharset()))); @@ -113,7 +112,7 @@ public class DataStoreTestUtil { return webpage; } - public static Employee createBoss(DataStore dataStore) + public static Employee createBoss() throws Exception { Employee employee = Employee.newBuilder().build(); @@ -127,7 +126,7 @@ public class DataStoreTestUtil { public static void testAutoCreateSchema(DataStore dataStore) throws Exception { //should not throw exception - dataStore.put("foo", createEmployee(dataStore)); + dataStore.put("foo", createEmployee()); } public static void testCreateEmployeeSchema(DataStore dataStore) @@ -170,7 +169,7 @@ public class DataStoreTestUtil { public static void testGetEmployee(DataStore dataStore) throws Exception { dataStore.createSchema(); - Employee employee = DataStoreTestUtil.createEmployee(dataStore); + Employee employee = DataStoreTestUtil.createEmployee(); String ssn = employee.getSsn().toString(); dataStore.put(ssn, employee); dataStore.flush(); @@ -183,8 +182,8 @@ public class DataStoreTestUtil { public static void testGetEmployeeRecursive(DataStore dataStore) throws Exception { - Employee employee = DataStoreTestUtil.createEmployee(dataStore); - Employee boss = DataStoreTestUtil.createBoss(dataStore); + Employee employee = DataStoreTestUtil.createEmployee(); + Employee boss = DataStoreTestUtil.createBoss(); employee.setBoss(boss); String ssn = employee.getSsn().toString(); @@ -197,9 +196,9 @@ public class DataStoreTestUtil { public static void testGetEmployeeDoubleRecursive(DataStore dataStore) throws Exception { - Employee employee = DataStoreTestUtil.createEmployee(dataStore); - Employee boss = DataStoreTestUtil.createBoss(dataStore); - Employee uberBoss = DataStoreTestUtil.createBoss(dataStore); + Employee employee = DataStoreTestUtil.createEmployee(); + Employee boss = DataStoreTestUtil.createBoss(); + Employee uberBoss = DataStoreTestUtil.createBoss(); uberBoss.setName(new Utf8("Überboss")) ; boss.setBoss(uberBoss) ; employee.setBoss(boss) ; @@ -214,7 +213,7 @@ public class DataStoreTestUtil { public static void testGetEmployeeNested(DataStore dataStore) throws Exception { - Employee employee = DataStoreTestUtil.createEmployee(dataStore); + Employee employee = DataStoreTestUtil.createEmployee(); WebPage webpage = new BeanFactoryImpl<>(String.class,WebPage.class).newPersistent() ; webpage.setUrl(new Utf8("url..")) ; @@ -236,7 +235,7 @@ public class DataStoreTestUtil { public static void testGetEmployee3UnionField(DataStore dataStore) throws Exception { - Employee employee = DataStoreTestUtil.createEmployee(dataStore); + Employee employee = DataStoreTestUtil.createEmployee(); employee.setBoss(new Utf8("Real boss")) ; String ssn = employee.getSsn().toString(); @@ -255,10 +254,10 @@ public class DataStoreTestUtil { public static void testGetEmployeeWithFields(DataStore dataStore) throws Exception { - Employee employee = DataStoreTestUtil.createEmployee(dataStore); - WebPage webpage = createWebPage(dataStore); + Employee employee = DataStoreTestUtil.createEmployee(); + WebPage webpage = createWebPage(); employee.setWebpage(webpage); - Employee boss = createBoss(dataStore); + Employee boss = createBoss(); employee.setBoss(boss); String ssn = employee.getSsn().toString(); dataStore.put(ssn, employee); @@ -392,7 +391,7 @@ public class DataStoreTestUtil { public static Employee testPutEmployee(DataStore dataStore) throws Exception { dataStore.createSchema(); - Employee employee = DataStoreTestUtil.createEmployee(dataStore); + Employee employee = DataStoreTestUtil.createEmployee(); return employee; } http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-goraci/src/main/java/org/apache/gora/goraci/Verify.java ---------------------------------------------------------------------- diff --git a/gora-goraci/src/main/java/org/apache/gora/goraci/Verify.java b/gora-goraci/src/main/java/org/apache/gora/goraci/Verify.java index 181e4b6..b922411 100644 --- a/gora-goraci/src/main/java/org/apache/gora/goraci/Verify.java +++ b/gora-goraci/src/main/java/org/apache/gora/goraci/Verify.java @@ -214,7 +214,7 @@ public class Verify extends Configured implements Tool { readFlushed(job.getConfiguration()); } - GoraMapper.initMapperJob(job, query, store, LongWritable.class, VLongWritable.class, VerifyMapper.class, true); + GoraMapper.initMapperJob(job, query, LongWritable.class, VLongWritable.class, VerifyMapper.class, true); job.getConfiguration().setBoolean("mapred.map.tasks.speculative.execution", false); http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-mongodb/src/main/java/org/apache/gora/mongodb/store/MongoMapping.java ---------------------------------------------------------------------- diff --git a/gora-mongodb/src/main/java/org/apache/gora/mongodb/store/MongoMapping.java b/gora-mongodb/src/main/java/org/apache/gora/mongodb/store/MongoMapping.java index 17f5d83..0d7d79e 100644 --- a/gora-mongodb/src/main/java/org/apache/gora/mongodb/store/MongoMapping.java +++ b/gora-mongodb/src/main/java/org/apache/gora/mongodb/store/MongoMapping.java @@ -153,8 +153,6 @@ public class MongoMapping { * Register a new mapping between a field from the persisted class to a * MongoDocument field. * - * @param docNameFromMapping - * name of the document as defined in the mapping * @param classFieldName * name of the field in the persisted class * @param docFieldName @@ -162,7 +160,7 @@ public class MongoMapping { * @param fieldType * type of the field */ - public void addClassField(String docNameFromMapping, String classFieldName, + public void addClassField(String classFieldName, String docFieldName, String fieldType) { try { // Register a new field for the mongo document http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-mongodb/src/main/java/org/apache/gora/mongodb/store/MongoMappingBuilder.java ---------------------------------------------------------------------- diff --git a/gora-mongodb/src/main/java/org/apache/gora/mongodb/store/MongoMappingBuilder.java b/gora-mongodb/src/main/java/org/apache/gora/mongodb/store/MongoMappingBuilder.java index a1ed76e..69b977f 100644 --- a/gora-mongodb/src/main/java/org/apache/gora/mongodb/store/MongoMappingBuilder.java +++ b/gora-mongodb/src/main/java/org/apache/gora/mongodb/store/MongoMappingBuilder.java @@ -167,7 +167,7 @@ public class MongoMappingBuilder { List fields = classElement.getChildren(TAG_FIELD); for (Element field : fields) { mapping - .addClassField(docNameFromMapping, field.getAttributeValue(ATT_NAME), + .addClassField(field.getAttributeValue(ATT_NAME), field.getAttributeValue(ATT_FIELD), field.getAttributeValue(ATT_TYPE)); } http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-mongodb/src/test/java/org/apache/gora/mongodb/filters/DefaultFactoryTest.java ---------------------------------------------------------------------- diff --git a/gora-mongodb/src/test/java/org/apache/gora/mongodb/filters/DefaultFactoryTest.java b/gora-mongodb/src/test/java/org/apache/gora/mongodb/filters/DefaultFactoryTest.java index bb0f06d..61969ff 100644 --- a/gora-mongodb/src/test/java/org/apache/gora/mongodb/filters/DefaultFactoryTest.java +++ b/gora-mongodb/src/test/java/org/apache/gora/mongodb/filters/DefaultFactoryTest.java @@ -45,8 +45,8 @@ public class DefaultFactoryTest { // Create dummy mapping for unit testing store = new MongoStore<>(); - store.getMapping().addClassField(null, "headers", "h", "document"); - store.getMapping().addClassField(null, "url", "url", "string"); + store.getMapping().addClassField("headers", "h", "document"); + store.getMapping().addClassField("url", "url", "string"); } @Test http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoMapping.java ---------------------------------------------------------------------- diff --git a/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoMapping.java b/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoMapping.java index df6dc03..3968112 100644 --- a/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoMapping.java +++ b/gora-mongodb/src/test/java/org/apache/gora/mongodb/store/TestMongoMapping.java @@ -32,58 +32,58 @@ public class TestMongoMapping { public void addSeveralTopLevelDocumentFields() { MongoMapping mapping = new MongoMapping(); // Add fields of type binary - mapping.addClassField("test", "classBin1", "topLevel1", + mapping.addClassField("classBin1", "topLevel1", DocumentFieldType.BINARY.toString().toLowerCase(Locale.getDefault())); - mapping.addClassField("test", "classBin2", "topLevel2", + mapping.addClassField("classBin2", "topLevel2", DocumentFieldType.BINARY.toString().toUpperCase(Locale.getDefault())); assertEquals("topLevel1", mapping.getDocumentField("classBin1")); assertEquals("topLevel2", mapping.getDocumentField("classBin2")); // Add fields of type int32 - mapping.addClassField("test", "classInt321", "topLevel3", + mapping.addClassField("classInt321", "topLevel3", DocumentFieldType.INT32.toString().toLowerCase(Locale.getDefault())); - mapping.addClassField("test", "classInt322", "topLevel4", + mapping.addClassField("classInt322", "topLevel4", DocumentFieldType.INT32.toString().toUpperCase(Locale.getDefault())); assertEquals("topLevel3", mapping.getDocumentField("classInt321")); assertEquals("topLevel4", mapping.getDocumentField("classInt322")); // Add fields of type int64 - mapping.addClassField("test", "classInt641", "topLevel5", + mapping.addClassField("classInt641", "topLevel5", DocumentFieldType.INT64.toString().toLowerCase(Locale.getDefault())); - mapping.addClassField("test", "classInt642", "topLevel6", + mapping.addClassField("classInt642", "topLevel6", DocumentFieldType.INT64.toString().toUpperCase(Locale.getDefault())); assertEquals("topLevel5", mapping.getDocumentField("classInt641")); assertEquals("topLevel6", mapping.getDocumentField("classInt642")); // Add fields of type double - mapping.addClassField("test", "classDouble1", "topLevel7", + mapping.addClassField("classDouble1", "topLevel7", DocumentFieldType.DOUBLE.toString().toLowerCase(Locale.getDefault())); - mapping.addClassField("test", "classDouble2", "topLevel8", + mapping.addClassField("classDouble2", "topLevel8", DocumentFieldType.DOUBLE.toString().toUpperCase(Locale.getDefault())); assertEquals("topLevel7", mapping.getDocumentField("classDouble1")); assertEquals("topLevel8", mapping.getDocumentField("classDouble2")); // Add fields of type string - mapping.addClassField("test", "classString1", "topLevel9", + mapping.addClassField("classString1", "topLevel9", DocumentFieldType.STRING.toString().toLowerCase(Locale.getDefault())); - mapping.addClassField("test", "classString2", "topLevel10", + mapping.addClassField("classString2", "topLevel10", DocumentFieldType.STRING.toString().toUpperCase(Locale.getDefault())); assertEquals("topLevel9", mapping.getDocumentField("classString1")); assertEquals("topLevel10", mapping.getDocumentField("classString2")); // Add fields of type date - mapping.addClassField("test", "classDate1", "topLevel11", + mapping.addClassField("classDate1", "topLevel11", DocumentFieldType.DATE.toString().toLowerCase(Locale.getDefault())); - mapping.addClassField("test", "classDate2", "topLevel12", + mapping.addClassField("classDate2", "topLevel12", DocumentFieldType.DATE.toString().toUpperCase(Locale.getDefault())); assertEquals("topLevel11", mapping.getDocumentField("classDate1")); assertEquals("topLevel12", mapping.getDocumentField("classDate2")); // Add fields of type list - mapping.addClassField("test", "classList1", "topLevel13", + mapping.addClassField("classList1", "topLevel13", DocumentFieldType.LIST.toString().toLowerCase(Locale.getDefault())); - mapping.addClassField("test", "classList2", "topLevel14", + mapping.addClassField("classList2", "topLevel14", DocumentFieldType.LIST.toString().toUpperCase(Locale.getDefault())); assertEquals("topLevel13", mapping.getDocumentField("classList1")); assertEquals("topLevel14", mapping.getDocumentField("classList2")); // Add fields of type document - mapping.addClassField("test", "classDocument1", "topLevel15", + mapping.addClassField("classDocument1", "topLevel15", DocumentFieldType.DOCUMENT.toString().toLowerCase(Locale.getDefault())); - mapping.addClassField("test", "classDocument2", "topLevel16", + mapping.addClassField("classDocument2", "topLevel16", DocumentFieldType.DOCUMENT.toString().toUpperCase(Locale.getDefault())); assertEquals("topLevel15", mapping.getDocumentField("classDocument1")); assertEquals("topLevel16", mapping.getDocumentField("classDocument2")); @@ -99,12 +99,12 @@ public class TestMongoMapping { // Add fields with already registered parent fields mapping = new MongoMapping(); - mapping.addClassField("test", "classField1", "top1", "document"); - mapping.addClassField("test", "classField2", "top1.level2-1", "string"); - mapping.addClassField("test", "classField3", "top1.level2-2", "int32"); - mapping.addClassField("test", "classField4", "top1.level2-3", "document"); - mapping.addClassField("test", "classField5", "top1.level2-4", "date"); - mapping.addClassField("test", "classField6", "top1.level2-3.leaf", "int64"); + mapping.addClassField("classField1", "top1", "document"); + mapping.addClassField("classField2", "top1.level2-1", "string"); + mapping.addClassField("classField3", "top1.level2-2", "int32"); + mapping.addClassField("classField4", "top1.level2-3", "document"); + mapping.addClassField("classField5", "top1.level2-4", "date"); + mapping.addClassField("classField6", "top1.level2-3.leaf", "int64"); assertEquals("top1", mapping.getDocumentField("classField1")); assertEquals(DocumentFieldType.DOCUMENT, mapping.getDocumentFieldType("top1")); @@ -126,10 +126,10 @@ public class TestMongoMapping { // Add fields with not already registered parent fields mapping = new MongoMapping(); - mapping.addClassField("test", "classField1", "top1.l2.l3.l4", "double"); - mapping.addClassField("test", "classField2", "top2.l2", "document"); - mapping.addClassField("test", "classField3", "top2.l2.l3.l5.l6", "list"); - mapping.addClassField("test", "classField4", "top1.l2.date", "date"); + mapping.addClassField("classField1", "top1.l2.l3.l4", "double"); + mapping.addClassField("classField2", "top2.l2", "document"); + mapping.addClassField("classField3", "top2.l2.l3.l5.l6", "list"); + mapping.addClassField("classField4", "top1.l2.date", "date"); assertEquals("top1.l2.l3.l4", mapping.getDocumentField("classField1")); assertEquals(DocumentFieldType.DOCUMENT, mapping.getDocumentFieldType("top1")); @@ -168,25 +168,25 @@ public class TestMongoMapping { @Test(expected = IllegalStateException.class) public void addConflictingFields1() { MongoMapping mapping = new MongoMapping(); - mapping.addClassField("test", "classFieldName", "top1", "int32"); - mapping.addClassField("test", "classFieldName", "top1.l2", "double"); // conflict + mapping.addClassField("classFieldName", "top1", "int32"); + mapping.addClassField("classFieldName", "top1.l2", "double"); // conflict } /** Add conflicting fields */ @Test(expected = IllegalStateException.class) public void addConflictingFields2() { MongoMapping mapping = new MongoMapping(); - mapping.addClassField("test", "classFieldName", "top1", "int64"); - mapping.addClassField("test", "classFieldName", "top1", "string"); // conflict + mapping.addClassField("classFieldName", "top1", "int64"); + mapping.addClassField("classFieldName", "top1", "string"); // conflict } /** Add conflicting fields */ @Test(expected = IllegalStateException.class) public void addConflictingFields3() { MongoMapping mapping = new MongoMapping(); - mapping.addClassField("test", "classFieldName", "top1", "document"); - mapping.addClassField("test", "classFieldName", "top1.l2", "string"); - mapping.addClassField("test", "classFieldName", "top1.l2.l3", "double"); // conflict + mapping.addClassField("classFieldName", "top1", "document"); + mapping.addClassField("classFieldName", "top1.l2", "string"); + mapping.addClassField("classFieldName", "top1.l2.l3", "double"); // conflict } } http://git-wip-us.apache.org/repos/asf/gora/blob/bcee2dbc/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java ---------------------------------------------------------------------- diff --git a/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java b/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java index b437299..a724dd6 100644 --- a/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java +++ b/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java @@ -18,7 +18,6 @@ import java.io.IOException; import java.net.MalformedURLException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; @@ -522,7 +521,7 @@ public class SolrStore extends DataStoreBase @SuppressWarnings("rawtypes") SpecificDatumReader reader = getDatumReader(fieldSchema.getFullName(), fieldSchema); - fieldValue = IOUtils.deserialize((byte[]) solrValue, reader, fieldSchema, + fieldValue = IOUtils.deserialize((byte[]) solrValue, reader, persistent.get(field.pos())); break; case ENUM: @@ -560,7 +559,7 @@ public class SolrStore extends DataStoreBase SpecificDatumReader unionReader = getDatumReader( String.valueOf(fieldSchema.hashCode()), fieldSchema); fieldValue = IOUtils.deserialize((byte[]) solrValue, unionReader, - fieldSchema, persistent.get(field.pos())); + persistent.get(field.pos())); break; } break; @@ -621,7 +620,7 @@ public class SolrStore extends DataStoreBase @SuppressWarnings("rawtypes") SpecificDatumWriter writer = getDatumWriter(fieldSchema.getFullName(), fieldSchema); - data = IOUtils.serialize(writer, fieldSchema, fieldValue); + data = IOUtils.serialize(writer, fieldValue); } catch (IOException e) { LOG.error(e.getMessage(), e); } @@ -647,7 +646,7 @@ public class SolrStore extends DataStoreBase @SuppressWarnings("rawtypes") SpecificDatumWriter writer = getDatumWriter( String.valueOf(fieldSchema.hashCode()), fieldSchema); - serilazeData = IOUtils.serialize(writer, fieldSchema, fieldValue); + serilazeData = IOUtils.serialize(writer, fieldValue); } catch (IOException e) { LOG.error(e.getMessage(), e); }