Author: ferdy
Date: Wed May 9 11:42:41 2012
New Revision: 1336108
URL: http://svn.apache.org/viewvc?rev=1336108&view=rev
Log:
GORA-129 redundant conf field in HBaseStore
Modified:
gora/trunk/CHANGES.txt
gora/trunk/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
Modified: gora/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/gora/trunk/CHANGES.txt?rev=1336108&r1=1336107&r2=1336108&view=diff
==============================================================================
--- gora/trunk/CHANGES.txt (original)
+++ gora/trunk/CHANGES.txt Wed May 9 11:42:41 2012
@@ -6,6 +6,8 @@ Gora Change Log
0.3 (trunk) Current Development:
+* GORA-129 redundant conf field in HBaseStore (ferdy)
+
* GORA-123 Append correct submodule directories to SCM paths in submodule
pom's (lewismc)
0.2 Release: 20/04/2012
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=1336108&r1=1336107&r2=1336108&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
Wed May 9 11:42:41 2012
@@ -80,7 +80,7 @@ import org.jdom.input.SAXBuilder;
public class HBaseStore<K, T extends Persistent> extends DataStoreBase<K, T>
implements Configurable {
- public static final Log log = LogFactory.getLog(HBaseStore.class);
+ public static final Log LOG = LogFactory.getLog(HBaseStore.class);
public static final String PARSE_MAPPING_FILE_KEY =
"gora.hbase.mapping.file";
@@ -92,8 +92,6 @@ implements Configurable {
private volatile HBaseTableConnection table;
- private volatile Configuration conf;
-
private final boolean autoCreateSchema = true;
private volatile HBaseMapping mapping;
@@ -114,12 +112,12 @@ implements Configurable {
} catch (FileNotFoundException ex) {
try {
mapping = readMapping(getConf().get(PARSE_MAPPING_FILE_KEY,
DEPRECATED_MAPPING_FILE));
- log.warn(DEPRECATED_MAPPING_FILE + " is deprecated, please rename the
file to "
+ LOG.warn(DEPRECATED_MAPPING_FILE + " is deprecated, please rename the
file to "
+ DEFAULT_MAPPING_FILE);
} catch (FileNotFoundException ex1) {
throw ex; //throw the original exception
} catch (Exception ex1) {
- log.warn(DEPRECATED_MAPPING_FILE + " is deprecated, please rename the
file to "
+ LOG.warn(DEPRECATED_MAPPING_FILE + " is deprecated, please rename the
file to "
+ DEFAULT_MAPPING_FILE);
throw new RuntimeException(ex1);
}
@@ -560,7 +558,7 @@ implements Configurable {
//tableNameFromMapping could be null here
if (!tableName.equals(tableNameFromMapping)) {
- log.info("Keyclass and nameclass match but mismatching table names
"
+ LOG.info("Keyclass and nameclass match but mismatching table names
"
+ " mappingfile schema is '" + tableNameFromMapping
+ "' vs actual schema '" + tableName + "' , assuming they are
the same.");
if (tableNameFromMapping != null) {
