svn commit: r831155 - in /hadoop/hbase/trunk: CHANGES.txt lib/AgileJSON-2009-03-30.jar src/java/org/apache/hadoop/hbase/HColumnDescriptor.java src/java/org/apache/hadoop/hbase/HTableDescriptor.java

[st...@apache.org]

Author: stack
Date: Thu Oct 29 23:45:57 2009
New Revision: 831155

URL: http://svn.apache.org/viewvc?rev=831155&view=rev
Log:
HBASE-1943 Remove AgileJSON; unused

Removed:
    hadoop/hbase/trunk/lib/AgileJSON-2009-03-30.jar
Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=831155&r1=831154&r2=831155&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Thu Oct 29 23:45:57 2009
@@ -145,6 +145,7 @@
    HBASE-1936  HLog group commit
    HBASE-1921  When the Master's session times out and there's only one, cluster is wedged
    HBASE-1942  Update hadoop jars in trunk; update to r831142
+   HBASE-1943  Remove AgileJSON; unused
 
   OPTIMIZATIONS
    HBASE-410   [testing] Speed up the test suite

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java?rev=831155&r1=831154&r2=831155&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HColumnDescriptor.java Thu Oct 29 23:45:57 2009
@@ -33,8 +33,6 @@
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.WritableComparable;
 
-import agilejson.TOJSON;
-
 /**
  * An HColumnDescriptor contains information about a column family such as the
  * number of versions, compression settings, etc.
@@ -278,7 +276,6 @@
   /**
    * @return Name of this column family
    */
-  @TOJSON(fieldName = "name", base64=true)
   public byte [] getName() {
     return name;
   }
@@ -344,14 +341,12 @@
   }
 
   /** @return compression type being used for the column family */
-  @TOJSON
   public Compression.Algorithm getCompression() {
     String n = getValue(COMPRESSION);
     return Compression.Algorithm.valueOf(n.toUpperCase());
   }
   
   /** @return maximum number of versions */
-  @TOJSON
   public synchronized int getMaxVersions() {
     if (this.cachedMaxVersions == -1) {
       String value = getValue(HConstants.VERSIONS);
@@ -371,7 +366,6 @@
   /**
    * @return Blocksize.
    */
-  @TOJSON
   public synchronized int getBlocksize() {
     if (this.blocksize == null) {
       String value = getValue(BLOCKSIZE);
@@ -392,7 +386,6 @@
   /**
    * @return Compression type setting.
    */
-  @TOJSON
   public Compression.Algorithm getCompressionType() {
     return getCompression();
   }
@@ -417,7 +410,6 @@
   /**
    * @return True if we are to keep all in use HRegionServer cache.
    */
-  @TOJSON(prefixLength = 2)
   public boolean isInMemory() {
     String value = getValue(HConstants.IN_MEMORY);
     if (value != null)
@@ -436,7 +428,6 @@
   /**
    * @return Time-to-live of cell contents, in seconds.
    */
-  @TOJSON
   public int getTimeToLive() {
     String value = getValue(TTL);
     return (value != null)? Integer.valueOf(value).intValue(): DEFAULT_TTL;
@@ -452,7 +443,6 @@
   /**
    * @return True if MapFile blocks should be cached.
    */
-  @TOJSON(prefixLength = 2)
   public boolean isBlockCacheEnabled() {
     String value = getValue(BLOCKCACHE);
     if (value != null)
@@ -470,7 +460,6 @@
   /**
    * @return true if a bloom filter is enabled
    */
-  @TOJSON(prefixLength = 2)
   public boolean isBloomfilter() {
     String value = getValue(BLOOMFILTER);
     if (value != null)

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java?rev=831155&r1=831154&r2=831155&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java Thu Oct 29 23:45:57 2009
@@ -36,8 +36,6 @@
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.io.WritableComparable;
 
-import agilejson.TOJSON;
-
 /**
  * HTableDescriptor contains the name of an HTable, and its
  * column families.
@@ -369,7 +367,6 @@
   }
 
   /** @return name of table */
-  @TOJSON
   public byte [] getName() {
     return name;
   }
@@ -603,7 +600,6 @@
     return Collections.unmodifiableSet(this.families.keySet());
   }
   
-  @TOJSON(fieldName = "columns")
   public HColumnDescriptor[] getColumnFamilies() {
     return getFamilies().toArray(new HColumnDescriptor[0]);
   }