This is an automated email from the ASF dual-hosted git repository.
djkevincr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/gora.git
The following commit(s) were added to refs/heads/master by this push:
new ae505d6 GORA-613 Remove deprecated usages in gora-core module
new 81e8f51 Merge pull request #164 from djkevincr/GORA-613
ae505d6 is described below
commit ae505d68be6f4c126d1bbb72a40ddb3a2b8dcf6a
Author: Kevin Ratnasekera <[email protected]>
AuthorDate: Thu May 2 12:46:48 2019 +0530
GORA-613 Remove deprecated usages in gora-core module
---
.../apache/gora/examples/mapreduce/MapReduceSerialization.java | 2 +-
.../java/org/apache/gora/examples/mapreduce/QueryCounter.java | 2 +-
.../java/org/apache/gora/examples/mapreduce/WordCount.java | 2 +-
.../src/main/java/org/apache/gora/flink/GoraFlinkEngine.java | 8 ++++----
.../main/java/org/apache/gora/mapreduce/NullOutputCommitter.java | 4 ----
.../src/test/java/org/apache/gora/hbase/store/TestHBaseStore.java | 2 +-
6 files changed, 8 insertions(+), 12 deletions(-)
diff --git
a/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/MapReduceSerialization.java
b/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/MapReduceSerialization.java
index a8dcf9e..6a9990d 100644
---
a/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/MapReduceSerialization.java
+++
b/gora-core/src/examples/java/org/apache/gora/examples/mapreduce/MapReduceSerialization.java
@@ -92,7 +92,7 @@ public class MapReduceSerialization extends Configured
implements Tool {
*/
public Job createJob(DataStore<String, WebPage> inStore, Query<String,
WebPage> query
, DataStore<String, WebPage> outStore) throws IOException {
- Job job = new Job(getConf());
+ Job job = Job.getInstance(getConf());
job.setJobName("Check serialization of dirty bits");
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 0f8119a..9d800e6 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
@@ -78,7 +78,7 @@ public class QueryCounter<K, T extends Persistent> extends
Configured implements
* @throws IOException
*/
public Job createJob(Query<K,T> query) throws IOException {
- Job job = new Job(getConf());
+ Job job = Job.getInstance(getConf());
job.setJobName("QueryCounter");
job.setNumReduceTasks(0);
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 17d5df3..f6ee173 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
@@ -105,7 +105,7 @@ public class WordCount extends Configured implements Tool {
*/
public Job createJob(Query<String,WebPage> query
, DataStore<String,TokenDatum> outStore) throws IOException {
- Job job = new Job(getConf());
+ Job job = Job.getInstance(getConf());
job.setJobName("WordCount");
diff --git a/gora-core/src/main/java/org/apache/gora/flink/GoraFlinkEngine.java
b/gora-core/src/main/java/org/apache/gora/flink/GoraFlinkEngine.java
index e5c1339..510b28e 100644
--- a/gora-core/src/main/java/org/apache/gora/flink/GoraFlinkEngine.java
+++ b/gora-core/src/main/java/org/apache/gora/flink/GoraFlinkEngine.java
@@ -70,7 +70,7 @@ public class GoraFlinkEngine<KeyIn, ValueIn
throws IOException {
Preconditions.checkNotNull(classKeyIn);
Preconditions.checkNotNull(classValueIn);
- Job job = new Job(conf);
+ Job job = Job.getInstance(conf);
DataStore<KeyIn, ValueIn> dataStore =
DataStoreFactory.getDataStore(dataStoreClass
, classKeyIn, classValueIn, job.getConfiguration());
GoraInputFormat.setInput(job, dataStore.newQuery(), true);
@@ -86,7 +86,7 @@ public class GoraFlinkEngine<KeyIn, ValueIn
throws IOException {
Preconditions.checkNotNull(classKeyIn);
Preconditions.checkNotNull(classValueIn);
- Job job = new Job(conf);
+ Job job = Job.getInstance(conf);
GoraInputFormat.setInput(job, dataStore.newQuery(), true);
HadoopInputFormat<KeyIn, ValueIn> wrappedGoraInput =
new HadoopInputFormat<>(new GoraInputFormat<>(),
@@ -99,7 +99,7 @@ public class GoraFlinkEngine<KeyIn, ValueIn
throws IOException {
Preconditions.checkNotNull(classKeyOut);
Preconditions.checkNotNull(classValueOut);
- Job job = new Job(conf);
+ Job job = Job.getInstance(conf);
GoraOutputFormat.setOutput(job, dataStore, true);
HadoopOutputFormat<KeyOut, ValueOut> wrappedGoraOutput =
new HadoopOutputFormat<>(
@@ -116,7 +116,7 @@ public class GoraFlinkEngine<KeyIn, ValueIn
throws IOException {
Preconditions.checkNotNull(classKeyOut);
Preconditions.checkNotNull(classValueOut);
- Job job = new Job(conf);
+ Job job = Job.getInstance(conf);
DataStore<KeyOut, ValueOut> dataStore =
DataStoreFactory.getDataStore(dataStoreClass
, classKeyOut, classValueOut, job.getConfiguration());
GoraOutputFormat.setOutput(job, dataStore, true);
diff --git
a/gora-core/src/main/java/org/apache/gora/mapreduce/NullOutputCommitter.java
b/gora-core/src/main/java/org/apache/gora/mapreduce/NullOutputCommitter.java
index 4b95cc3..12951b1 100644
--- a/gora-core/src/main/java/org/apache/gora/mapreduce/NullOutputCommitter.java
+++ b/gora-core/src/main/java/org/apache/gora/mapreduce/NullOutputCommitter.java
@@ -33,10 +33,6 @@ public class NullOutputCommitter extends OutputCommitter {
}
@Override
- public void cleanupJob(JobContext arg0) throws IOException {
- }
-
- @Override
public void commitTask(TaskAttemptContext arg0) throws IOException {
}
diff --git
a/gora-hbase/src/test/java/org/apache/gora/hbase/store/TestHBaseStore.java
b/gora-hbase/src/test/java/org/apache/gora/hbase/store/TestHBaseStore.java
index 7652552..876778d 100644
--- a/gora-hbase/src/test/java/org/apache/gora/hbase/store/TestHBaseStore.java
+++ b/gora-hbase/src/test/java/org/apache/gora/hbase/store/TestHBaseStore.java
@@ -339,7 +339,7 @@ public class TestHBaseStore extends DataStoreTestBase {
.newBuilder(Bytes.toBytes("test-family"));
columnDescBuilder.setNewVersionBehavior(true);
ColumnFamilyDescriptor columnDescriptor = columnDescBuilder.build();
- tableDescBuilder.addColumnFamily(columnDescriptor);
+ tableDescBuilder.setColumnFamily(columnDescriptor);
TableDescriptor tableDescriptor = tableDescBuilder.build();
conn.getAdmin().createTable(tableDescriptor);
