trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbirds...@apache.org
Subject [7/9] incubator-trafodion git commit: Most of the Trafodion Java source files are built through Maven, using projects DCS, REST, HBase-trx and SQL. A few files remain in the core/sql/executor and core/sql/ustat directories that are built through javac co
Date Fri, 02 Oct 2015 16:16:36 GMT
Most of the Trafodion Java source files are built through Maven, using
projects DCS, REST, HBase-trx and SQL. A few files remain in the
core/sql/executor and core/sql/ustat directories that are built
through javac commands in the Makefile and helper files. Also, these
files don't conform to common naming standards and therefore are a bit
harder to debug with tools like Eclipse.

I would like to do the following:

1. Move these remaining Java source files under core/sql/src,
   where the UDR-related files already are.
2. Include the class files in trafodion-sql-1.2.0.jar, the
   deliverable of the core/sql Maven project.
3. Change the package name to org.trafodion.sql for all these files.
4. Remove the trafodion-HBaseAccess-1.2.0.jar file (content
   will be included in trafodion-sql-1.2.0.jar). This jar file
   used to be built with a Makefile.
5. Make some source code changes to reflect the new package names
   and to avoid calling private method of class
   org.apache.hadoop.hive.ql.io.orc.OrcStruct.
6. Remove Makefile rules for compiling Java files.

Also, this change includes a change of the component name for the
event logger. We use SQL.COMP now, to make analyzing log messages
for Trafodion easier. Venkat asked for this change.


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a44823fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a44823fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a44823fe

Branch: refs/heads/master
Commit: a44823fe2fd3991bc13434f73692a70b661efd43
Parents: 0a8da29
Author: Hans Zeller <hans.zeller@esgyn.com>
Authored: Thu Oct 1 02:01:45 2015 +0000
Committer: Hans Zeller <hans.zeller@esgyn.com>
Committed: Thu Oct 1 02:01:45 2015 +0000

----------------------------------------------------------------------
 core/sqf/sqenvcom.sh                            |    1 -
 core/sqf/src/seatrans/hbase-trx/Makefile        |    2 +-
 core/sql/executor/ByteArrayList.java            |   54 -
 core/sql/executor/HBaseClient.java              | 1596 ------------------
 core/sql/executor/HBaseClient_JNI.cpp           |   30 +-
 core/sql/executor/HBaseClient_JNI.h             |    2 +-
 core/sql/executor/HBulkLoadClient.java          |  533 ------
 core/sql/executor/HTableClient.h                |   65 -
 core/sql/executor/HTableClient.java             | 1334 ---------------
 core/sql/executor/HiveClient.java               |  301 ----
 core/sql/executor/OrcFileReader.cpp             |    4 +-
 core/sql/executor/OrcFileReader.java            |  518 ------
 core/sql/executor/ResultIterator.java           |  133 --
 core/sql/executor/ResultKeyValueList.java       |  100 --
 core/sql/executor/RowToInsert.java              |   44 -
 core/sql/executor/RowsToInsert.java             |   57 -
 core/sql/executor/SequenceFileReader.cpp        |    4 +-
 core/sql/executor/SequenceFileReader.java       |  448 -----
 core/sql/executor/SequenceFileWriter.java       |  467 -----
 core/sql/executor/StringArrayList.java          |   47 -
 .../executor/org_trafodion_sql_HTableClient.h   |   43 +
 core/sql/nskgmake/Makerules.build               |   13 -
 core/sql/nskgmake/Makerules.linux               |   13 -
 core/sql/nskgmake/Makerules.mk                  |   73 +-
 core/sql/nskgmake/executor/Makefile             |   54 -
 core/sql/nskgmake/ustat/Makefile                |   13 -
 core/sql/pom.xml                                |   49 +
 core/sql/qmscommon/QRLogger.cpp                 |   18 +-
 .../java/org/trafodion/sql/ByteArrayList.java   |   54 +
 .../java/org/trafodion/sql/HBaseClient.java     | 1596 ++++++++++++++++++
 .../java/org/trafodion/sql/HBulkLoadClient.java |  533 ++++++
 .../java/org/trafodion/sql/HTableClient.java    | 1337 +++++++++++++++
 .../main/java/org/trafodion/sql/HiveClient.java |  301 ++++
 .../java/org/trafodion/sql/OrcFileReader.java   |  500 ++++++
 .../java/org/trafodion/sql/ResultIterator.java  |  133 ++
 .../org/trafodion/sql/ResultKeyValueList.java   |  100 ++
 .../java/org/trafodion/sql/RowToInsert.java     |   44 +
 .../java/org/trafodion/sql/RowsToInsert.java    |   57 +
 .../org/trafodion/sql/SequenceFileReader.java   |  448 +++++
 .../org/trafodion/sql/SequenceFileWriter.java   |  467 +++++
 .../java/org/trafodion/sql/StringArrayList.java |   47 +
 .../org/trafodion/sql/ustat/ChgAutoList.java    |  426 +++++
 .../java/org/trafodion/sql/ustat/UstatUtil.java |  442 +++++
 core/sql/ustat/ChgAutoList.java                 |  426 -----
 core/sql/ustat/UstatUtil.java                   |  442 -----
 45 files changed, 6610 insertions(+), 6759 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a44823fe/core/sqf/sqenvcom.sh
----------------------------------------------------------------------
diff --git a/core/sqf/sqenvcom.sh b/core/sqf/sqenvcom.sh
index df7eb52..2de3983 100644
--- a/core/sqf/sqenvcom.sh
+++ b/core/sqf/sqenvcom.sh
@@ -872,7 +872,6 @@ if [[ -n "$SQ_CLASSPATH"   ]]; then SQ_CLASSPATH="$SQ_CLASSPATH:";   fi
 SQ_CLASSPATH=${SQ_CLASSPATH}${HBASE_TRXDIR}:\
 ${HBASE_TRXDIR}/${HBASE_TRX_JAR}:\
 $MY_SQROOT/export/lib/trafodion-sql-${TRAFODION_VER}.jar:\
-$MY_SQROOT/export/lib/trafodion-HBaseAccess-${TRAFODION_VER}.jar:\
 $MY_SQROOT/export/lib/jdbcT2.jar
 
 # Check whether the current shell environment changed from a previous execution of this

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a44823fe/core/sqf/src/seatrans/hbase-trx/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/Makefile b/core/sqf/src/seatrans/hbase-trx/Makefile
index fd99bad..7abfa16 100644
--- a/core/sqf/src/seatrans/hbase-trx/Makefile
+++ b/core/sqf/src/seatrans/hbase-trx/Makefile
@@ -36,7 +36,7 @@ all: build_all
 
 jdk_1_7_cdh:
 	$(MAKE) build_chk_cdh
-	set -o pipefail && $(MAVEN) -f pom.xml.cdh package -DskipTests | tee -a build_trx.log
+	set -o pipefail && $(MAVEN) -f pom.xml.cdh package install -DskipTests | tee -a build_trx.log
 	cp -pf target/$(BLD_HBASE_CDH_TRX_JARNAME) $(MY_SQROOT)/export/lib
 	$(RM) $(VFILE)
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a44823fe/core/sql/executor/ByteArrayList.java
----------------------------------------------------------------------
diff --git a/core/sql/executor/ByteArrayList.java b/core/sql/executor/ByteArrayList.java
deleted file mode 100644
index cb8d6ac..0000000
--- a/core/sql/executor/ByteArrayList.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-
-package org.trafodion.sql.HBaseAccess;
-
-import java.util.ArrayList;
-
-public class ByteArrayList extends ArrayList<byte[]> {
-
-	private static final long serialVersionUID = -3557219337406352735L;
-
-	void addElement(byte[] ba) {
-	        add(ba);
-	}
-
-	byte[] getElement(int i) {
-	    if (size() == 0)
-		return null;
-	    else if (i < size())
-		return get(i);
-	    else
-		return null;
-	}
-
-        int getSize() {
-           return size();
-	}
-
-        int getEntrySize(int i) {
-          return get(i).length;
-        }
-
-        byte[] getEntry(int i) {
-          return get(i);
-        }
-}

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a44823fe/core/sql/executor/HBaseClient.java
----------------------------------------------------------------------
diff --git a/core/sql/executor/HBaseClient.java b/core/sql/executor/HBaseClient.java
deleted file mode 100644
index 1bc02f3..0000000
--- a/core/sql/executor/HBaseClient.java
+++ /dev/null
@@ -1,1596 +0,0 @@
-// @@@ START COPYRIGHT @@@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-// @@@ END COPYRIGHT @@@
-
-package org.trafodion.sql.HBaseAccess;
-
-import com.google.protobuf.ServiceException;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.NavigableMap;
-import java.util.Map;
-import java.util.Arrays;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.apache.log4j.PropertyConfigurator;
-import org.apache.log4j.Logger;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.NamespaceDescriptor;
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
-import org.apache.hadoop.hbase.client.transactional.RMInterface;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.FSUtils;
-import org.apache.hadoop.hbase.util.HFileArchiveUtil;
-import org.apache.hadoop.hbase.util.Pair;
-import org.apache.hadoop.hbase.util.PoolMap;
-import org.apache.hadoop.hbase.util.PoolMap.PoolType;
-import org.apache.hadoop.hbase.security.access.AccessController;
-import org.apache.hadoop.hbase.security.access.UserPermission;
-import org.apache.hadoop.hbase.security.access.Permission;
-import org.apache.hadoop.hbase.MasterNotRunningException;
-import org.apache.hadoop.hbase.ZooKeeperConnectionException;
-import org.apache.hadoop.hbase.snapshot.SnapshotCreationException;
-import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
-import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription.Type;
-//import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos;
-
-import org.apache.hadoop.hbase.io.compress.Compression.Algorithm;
-//import org.apache.hadoop.hbase.io.hfile.Compression.Algorithm;
-import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
-import org.apache.hadoop.hbase.regionserver.BloomType; 
-//import org.apache.hadoop.hbase.regionserver.StoreFile.BloomType ;
-import org.apache.hadoop.hbase.regionserver.KeyPrefixRegionSplitPolicy;
-import org.apache.hadoop.hbase.client.Durability;
-import org.trafodion.sql.HBaseAccess.HTableClient;
-import org.apache.hadoop.hbase.ServerLoad;
-import org.apache.hadoop.hbase.RegionLoad;
-import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.ClusterStatus;
-import org.apache.hadoop.hbase.ServerName;
-
-import java.util.concurrent.ExecutionException;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.permission.AclEntry;
-import org.apache.hadoop.hbase.io.hfile.CacheConfig;
-import org.apache.hadoop.hbase.io.hfile.HFile;
-import org.apache.hadoop.hbase.io.hfile.HFileScanner;
-import org.apache.hadoop.hbase.io.hfile.FixedFileTrailer;
-import org.apache.hadoop.hbase.regionserver.StoreFileInfo;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.client.DtmConst;
-import org.apache.commons.codec.binary.Hex;
-
-import com.google.protobuf.ServiceException;
-
-public class HBaseClient {
-
-    static Logger logger = Logger.getLogger(HBaseClient.class.getName());
-    public static Configuration config = HBaseConfiguration.create();
-    String lastError;
-    RMInterface table = null;
-
-    private PoolMap<String, HTableClient> hTableClientsFree;
-    private PoolMap<String, HTableClient> hTableClientsInUse;
-    // this set of constants MUST be kept in sync with the C++ enum in
-    // ExpHbaseDefs.h
-    public static final int HBASE_NAME = 0;
-    public static final int HBASE_MAX_VERSIONS = 1;
-    public static final int HBASE_MIN_VERSIONS = 2;
-    public static final int HBASE_TTL = 3;
-    public static final int HBASE_BLOCKCACHE = 4;
-    public static final int HBASE_IN_MEMORY = 5;
-    public static final int HBASE_COMPRESSION = 6;
-    public static final int HBASE_BLOOMFILTER = 7;
-    public static final int HBASE_BLOCKSIZE = 8;
-    public static final int HBASE_DATA_BLOCK_ENCODING = 9;
-    public static final int HBASE_CACHE_BLOOMS_ON_WRITE = 10;
-    public static final int HBASE_CACHE_DATA_ON_WRITE = 11;
-    public static final int HBASE_CACHE_INDEXES_ON_WRITE = 12;
-    public static final int HBASE_COMPACT_COMPRESSION = 13;
-    public static final int HBASE_PREFIX_LENGTH_KEY = 14;
-    public static final int HBASE_EVICT_BLOCKS_ON_CLOSE = 15;
-    public static final int HBASE_KEEP_DELETED_CELLS = 16;
-    public static final int HBASE_REPLICATION_SCOPE = 17;
-    public static final int HBASE_MAX_FILESIZE = 18;
-    public static final int HBASE_COMPACT = 19;
-    public static final int HBASE_DURABILITY = 20;
-    public static final int HBASE_MEMSTORE_FLUSH_SIZE = 21;
-    public static final int HBASE_SPLIT_POLICY = 22;
-
-    
-    public HBaseClient() {
-      if (hTableClientsFree == null)
-         hTableClientsFree = new PoolMap<String, HTableClient>
-                 (PoolType.Reusable, Integer.MAX_VALUE);
-      hTableClientsInUse = new PoolMap<String, HTableClient>
-               (PoolType.Reusable, Integer.MAX_VALUE);
-    }
-
-    public String getLastError() {
-        return lastError;
-    }
-
-    void setLastError(String err) {
-        lastError = err;
-    }
-
-    static {
-    	//Some clients of this class e.g., DcsServer/JdbcT2 
-    	//want to use use their own log4j.properties file instead
-    	//of the /conf/lo4j.hdf.config so they can see their
-    	//log events in their own log files or console.
-    	//So, check for alternate log4j.properties otherwise
-    	//use the default HBaseClient config.
-    	String confFile = System.getProperty("hbaseclient.log4j.properties");
-    	if(confFile == null) {
-    		System.setProperty("trafodion.hdfs.log", System.getenv("MY_SQROOT") + "/logs/trafodion.hdfs.log");
-    		confFile = System.getenv("MY_SQROOT") + "/conf/log4j.hdfs.config";
-    	}
-    	PropertyConfigurator.configure(confFile);
-    }
-
-    public boolean init(String zkServers, String zkPort) 
-	throws MasterNotRunningException, ZooKeeperConnectionException, ServiceException, IOException
-    {
-        if (logger.isDebugEnabled()) logger.debug("HBaseClient.init(" + zkServers + ", " + zkPort
-                         + ") called.");
-        HBaseAdmin.checkHBaseAvailable(config);
-
-        try {
-            table = new RMInterface();
-        } catch (Exception e) {
-            if (logger.isDebugEnabled()) logger.debug("HBaseClient.init: Error in RMInterface instace creation.");
-        }
-        
-        return true;
-    }
- 
-    private void  cleanup(PoolMap hTableClientsPool) throws IOException
-    {
-       Collection hTableClients;
-       Iterator<HTableClient> iter;
-       HTableClient htable;
-       boolean clearRegionCache = false;
-       boolean cleanJniObject = true;
-
-       hTableClients = hTableClientsPool.values();
-       iter = hTableClients.iterator();
-       while (iter.hasNext())
-       {
-         htable = iter.next();
-         htable.close(clearRegionCache, cleanJniObject);          
-       }
-       hTableClientsPool.clear();
-    }
-
-    public boolean cleanup() throws IOException {
-       cleanup(hTableClientsInUse);
-       cleanup(hTableClientsFree);
-       return true;
-    }
-
-   public void cleanupCache(Collection hTableClients) throws IOException
-    {
-       Iterator<HTableClient> iter;
-       HTableClient htable;
-       boolean clearRegionCache = true;
-       boolean cleanJniObject = false;
- 
-       iter = hTableClients.iterator();
-       while (iter.hasNext())
-       {
-          htable = iter.next();
-          htable.close(clearRegionCache, cleanJniObject);     
-       }
-    }
-
-    public boolean cleanupCache(String tblName) throws IOException
-    {
-       Collection hTableClients;
-       hTableClients = hTableClientsFree.values(tblName);
-       cleanupCache(hTableClients);  
-       hTableClientsFree.remove(tblName);
-       hTableClients = hTableClientsInUse.values(tblName);
-       cleanupCache(hTableClients);  
-       hTableClientsInUse.remove(tblName);
-       return true;
-    }
-
-    public boolean create(String tblName, Object[]  colFamNameList,
-                          boolean isMVCC) 
-        throws IOException, MasterNotRunningException {
-            if (logger.isDebugEnabled()) logger.debug("HBaseClient.create(" + tblName + ") called, and MVCC is " + isMVCC + ".");
-            cleanupCache(tblName);
-            HTableDescriptor desc = new HTableDescriptor(tblName);
-            for (int i = 0; i < colFamNameList.length ; i++) {
-		String  colFam = (String)colFamNameList[i];
-                HColumnDescriptor colDesc = new HColumnDescriptor(colFam);
-                if (isMVCC)
-                  colDesc.setMaxVersions(DtmConst.MVCC_MAX_VERSION);
-                else
-                  colDesc.setMaxVersions(DtmConst.SSCC_MAX_VERSION);
-                desc.addFamily(colDesc);
-            }
-            HColumnDescriptor metaColDesc = new HColumnDescriptor(DtmConst.TRANSACTION_META_FAMILY);
-            if (isMVCC)
-              metaColDesc.setMaxVersions(DtmConst.MVCC_MAX_DATA_VERSION);
-            else
-              metaColDesc.setMaxVersions(DtmConst.SSCC_MAX_DATA_VERSION);
-            metaColDesc.setInMemory(true);
-            desc.addFamily(metaColDesc);
-            HBaseAdmin admin = new HBaseAdmin(config);
-            admin.createTable(desc);
-            admin.close();
-            return true;
-   } 
-
-   // used for returning two flags from setDescriptors method
-
-   private class ChangeFlags {
-       boolean tableDescriptorChanged;
-       boolean columnDescriptorChanged;
-
-       ChangeFlags() {
-           tableDescriptorChanged = false;
-           columnDescriptorChanged = false;
-       }
-
-       void setTableDescriptorChanged() {
-           tableDescriptorChanged = true;
-       }
-
-       void setColumnDescriptorChanged() {
-           columnDescriptorChanged = true;
-       }
-
-       boolean tableDescriptorChanged() {
-           return tableDescriptorChanged;
-       }
-
-       boolean columnDescriptorChanged() {
-           return columnDescriptorChanged;
-       }
-   }
-
-   private ChangeFlags setDescriptors(Object[] tableOptions,
-                                      HTableDescriptor desc,
-                                      HColumnDescriptor colDesc,
-                                      int defaultVersionsValue) {
-       ChangeFlags returnStatus = new ChangeFlags();
-       String trueStr = "TRUE";
-       for (int i = 0; i < tableOptions.length; i++) {
-           if (i == HBASE_NAME)	
-               continue ;
-           String tableOption = (String)tableOptions[i];
-           if ((i != HBASE_MAX_VERSIONS) && (tableOption.isEmpty()))
-               continue ;
-           switch (i) {
-           case HBASE_MAX_VERSIONS:
-               if (tableOption.isEmpty()) {
-                   if (colDesc.getMaxVersions() != defaultVersionsValue) {
-                       colDesc.setMaxVersions(defaultVersionsValue);
-                       returnStatus.setColumnDescriptorChanged();
-                   }
-               }
-               else {
-                   colDesc.setMaxVersions
-                       (Integer.parseInt(tableOption));
-                   returnStatus.setColumnDescriptorChanged();
-               }
-               break ;
-           case HBASE_MIN_VERSIONS:
-               colDesc.setMinVersions
-                   (Integer.parseInt(tableOption));
-               returnStatus.setColumnDescriptorChanged();
-               break ;
-           case HBASE_TTL:
-               colDesc.setTimeToLive
-                   (Integer.parseInt(tableOption));
-               returnStatus.setColumnDescriptorChanged();
-               break ;
-           case HBASE_BLOCKCACHE:
-               if (tableOption.equalsIgnoreCase(trueStr))
-                   colDesc.setBlockCacheEnabled(true);
-               else
-                   colDesc.setBlockCacheEnabled(false);
-               returnStatus.setColumnDescriptorChanged();
-               break ;
-           case HBASE_IN_MEMORY:
-               if (tableOption.equalsIgnoreCase(trueStr))
-                   colDesc.setInMemory(true);
-               else
-                   colDesc.setInMemory(false);
-               returnStatus.setColumnDescriptorChanged();
-               break ;
-           case HBASE_COMPRESSION:
-               if (tableOption.equalsIgnoreCase("GZ"))
-                   colDesc.setCompressionType(Algorithm.GZ);
-               else if (tableOption.equalsIgnoreCase("LZ4"))
-                   colDesc.setCompressionType(Algorithm.LZ4);
-               else if (tableOption.equalsIgnoreCase("LZO"))
-                   colDesc.setCompressionType(Algorithm.LZO);
-               else if (tableOption.equalsIgnoreCase("NONE"))
-                   colDesc.setCompressionType(Algorithm.NONE);
-               else if (tableOption.equalsIgnoreCase("SNAPPY"))
-                   colDesc.setCompressionType(Algorithm.SNAPPY); 
-               returnStatus.setColumnDescriptorChanged();
-               break ;
-           case HBASE_BLOOMFILTER:
-               if (tableOption.equalsIgnoreCase("NONE"))
-                   colDesc.setBloomFilterType(BloomType.NONE);
-               else if (tableOption.equalsIgnoreCase("ROW"))
-                   colDesc.setBloomFilterType(BloomType.ROW);
-               else if (tableOption.equalsIgnoreCase("ROWCOL"))
-                   colDesc.setBloomFilterType(BloomType.ROWCOL); 
-               returnStatus.setColumnDescriptorChanged();
-               break ;
-           case HBASE_BLOCKSIZE:
-               colDesc.setBlocksize
-                   (Integer.parseInt(tableOption));
-               returnStatus.setColumnDescriptorChanged();
-               break ;
-           case HBASE_DATA_BLOCK_ENCODING:
-               if (tableOption.equalsIgnoreCase("DIFF"))
-                   colDesc.setDataBlockEncoding(DataBlockEncoding.DIFF);
-               else if (tableOption.equalsIgnoreCase("FAST_DIFF"))
-                   colDesc.setDataBlockEncoding(DataBlockEncoding.FAST_DIFF);
-               else if (tableOption.equalsIgnoreCase("NONE"))
-                   colDesc.setDataBlockEncoding(DataBlockEncoding.NONE);
-               else if (tableOption.equalsIgnoreCase("PREFIX"))
-                   colDesc.setDataBlockEncoding(DataBlockEncoding.PREFIX);
-               else if (tableOption.equalsIgnoreCase("PREFIX_TREE"))
-                   colDesc.setDataBlockEncoding(DataBlockEncoding.PREFIX_TREE);
-               returnStatus.setColumnDescriptorChanged();
-               break ;
-           case HBASE_CACHE_BLOOMS_ON_WRITE:
-               if (tableOption.equalsIgnoreCase(trueStr))
-                   colDesc.setCacheBloomsOnWrite(true);
-               else
-                   colDesc.setCacheBloomsOnWrite(false);
-               returnStatus.setColumnDescriptorChanged();
-               break ;
-           case HBASE_CACHE_DATA_ON_WRITE:
-               if (tableOption.equalsIgnoreCase(trueStr))
-                   colDesc.setCacheDataOnWrite(true);
-               else
-                   colDesc.setCacheDataOnWrite(false);
-               returnStatus.setColumnDescriptorChanged();
-               break ;
-           case HBASE_CACHE_INDEXES_ON_WRITE:
-               if (tableOption.equalsIgnoreCase(trueStr))
-                   colDesc.setCacheIndexesOnWrite(true);
-               else
-                   colDesc.setCacheIndexesOnWrite(false);
-               returnStatus.setColumnDescriptorChanged();
-               break ;
-           case HBASE_COMPACT_COMPRESSION:
-               if (tableOption.equalsIgnoreCase("GZ"))
-                   colDesc.setCompactionCompressionType(Algorithm.GZ);
-               else if (tableOption.equalsIgnoreCase("LZ4"))
-                   colDesc.setCompactionCompressionType(Algorithm.LZ4);
-               else if (tableOption.equalsIgnoreCase("LZO"))
-                   colDesc.setCompactionCompressionType(Algorithm.LZO);
-               else if (tableOption.equalsIgnoreCase("NONE"))
-                   colDesc.setCompactionCompressionType(Algorithm.NONE);
-               else if (tableOption.equalsIgnoreCase("SNAPPY"))
-                   colDesc.setCompactionCompressionType(Algorithm.SNAPPY); 
-               returnStatus.setColumnDescriptorChanged();
-               break ;
-           case HBASE_PREFIX_LENGTH_KEY:
-               desc.setValue(KeyPrefixRegionSplitPolicy.PREFIX_LENGTH_KEY,
-                             tableOption);
-               returnStatus.setTableDescriptorChanged();
-               break ;
-           case HBASE_EVICT_BLOCKS_ON_CLOSE:
-               if (tableOption.equalsIgnoreCase(trueStr))
-                   colDesc.setEvictBlocksOnClose(true);
-               else
-                   colDesc.setEvictBlocksOnClose(false);
-               returnStatus.setColumnDescriptorChanged();
-               break ;
-           case HBASE_KEEP_DELETED_CELLS:
-               if (tableOption.equalsIgnoreCase(trueStr))
-                   colDesc.setKeepDeletedCells(true);
-               else
-                   colDesc.setKeepDeletedCells(false);
-               returnStatus.setColumnDescriptorChanged();
-               break ;
-           case HBASE_REPLICATION_SCOPE:
-               colDesc.setScope
-                   (Integer.parseInt(tableOption));
-               returnStatus.setColumnDescriptorChanged();
-               break ;
-           case HBASE_MAX_FILESIZE:
-               desc.setMaxFileSize
-                   (Long.parseLong(tableOption));
-               returnStatus.setTableDescriptorChanged();
-               break ;
-           case HBASE_COMPACT:
-              if (tableOption.equalsIgnoreCase(trueStr))
-                   desc.setCompactionEnabled(true);
-               else
-                   desc.setCompactionEnabled(false); 
-               returnStatus.setTableDescriptorChanged();
-               break ;
-           case HBASE_DURABILITY:
-               if (tableOption.equalsIgnoreCase("ASYNC_WAL"))
-                   desc.setDurability(Durability.ASYNC_WAL);
-               else if (tableOption.equalsIgnoreCase("FSYNC_WAL"))
-                   desc.setDurability(Durability.FSYNC_WAL);
-               else if (tableOption.equalsIgnoreCase("SKIP_WAL"))
-                   desc.setDurability(Durability.SKIP_WAL);
-               else if (tableOption.equalsIgnoreCase("SYNC_WAL"))
-                   desc.setDurability(Durability.SYNC_WAL);
-               else if (tableOption.equalsIgnoreCase("USE_DEFAULT"))
-                   desc.setDurability(Durability.USE_DEFAULT);
-               returnStatus.setTableDescriptorChanged(); 
-               break ;
-           case HBASE_MEMSTORE_FLUSH_SIZE:
-               desc.setMemStoreFlushSize
-                   (Long.parseLong(tableOption));
-               returnStatus.setTableDescriptorChanged();
-               break ;
-           case HBASE_SPLIT_POLICY:
-               // This method not yet available in earlier versions
-               // desc.setRegionSplitPolicyClassName(tableOption));
-               desc.setValue(desc.SPLIT_POLICY, tableOption);
-               returnStatus.setTableDescriptorChanged();
-               break ;
-           default:
-               break;
-           }
-       }
-
-       return returnStatus;
-   }
-   
-
-   public boolean createk(String tblName, Object[] tableOptions,
-       Object[]  beginEndKeys, long transID, int numSplits, int keyLength,
-       boolean isMVCC)
-       throws IOException, MasterNotRunningException {
-            if (logger.isDebugEnabled()) logger.debug("HBaseClient.createk(" + tblName + ") called.");
-            String trueStr = "TRUE";
-            cleanupCache(tblName);
-            HTableDescriptor desc = new HTableDescriptor(tblName);
-
-            int defaultVersionsValue = 0;
-            if (isMVCC)
-                defaultVersionsValue = DtmConst.MVCC_MAX_VERSION;
-            else
-                defaultVersionsValue = DtmConst.SSCC_MAX_VERSION;
-
-            // column family names are space delimited list of names.
-            // extract all family names and add to table descriptor.
-            // All other default and specified options remain the same for all families.
-            String colFamsStr = (String)tableOptions[HBASE_NAME];
-            String[] colFamsArr = colFamsStr.split("\\s+"); 
-
-            for (int i = 0; i < colFamsArr.length; i++){            
-                String colFam = colFamsArr[i];
-
-                HColumnDescriptor colDesc = new HColumnDescriptor(colFam);
-
-                // change the descriptors based on the tableOptions; 
-                setDescriptors(tableOptions,desc /*out*/,colDesc /*out*/, defaultVersionsValue);
-                
-                desc.addFamily(colDesc);
-            }
-
-            HColumnDescriptor metaColDesc = new HColumnDescriptor(DtmConst.TRANSACTION_META_FAMILY);
-            if (isMVCC)
-              metaColDesc.setMaxVersions(DtmConst.MVCC_MAX_DATA_VERSION);
-            else
-              metaColDesc.setMaxVersions(DtmConst.SSCC_MAX_DATA_VERSION);
-            metaColDesc.setInMemory(true);
-            desc.addFamily(metaColDesc);
-            HBaseAdmin admin = new HBaseAdmin(config);
-
-            try {
-               if (beginEndKeys != null && beginEndKeys.length > 0)
-               {
-                  byte[][] keys = new byte[beginEndKeys.length][];
-                  for (int i = 0; i < beginEndKeys.length; i++){
-                     keys[i] = (byte[])beginEndKeys[i]; 
-                     if (logger.isDebugEnabled()) logger.debug("HBaseClient.createk key #" + i + "value" + keys[i] + ") called.");
-                  }
-                  if (transID != 0) {
-                     table.createTable(desc, keys, numSplits, keyLength, transID);
-                     if (logger.isDebugEnabled()) logger.debug("HBaseClient.createk beginEndKeys(" + beginEndKeys + ") called.");
-                  } else {
-                     admin.createTable(desc, keys);
-                  }
-               }
-               else {
-                  if (transID != 0) {
-                     table.createTable(desc, null, numSplits, keyLength, transID);
-                  } else {
-                     admin.createTable(desc);
-                  }
-               }
-            }
-            catch (IOException e)
-            {
-               if (logger.isDebugEnabled()) logger.debug("HbaseClient.createk : createTable error" + e);
-               throw e;
-            }
-            admin.close();
-        return true;
-    }
-
-    public boolean registerTruncateOnAbort(String tblName, long transID)
-        throws MasterNotRunningException, IOException {
-
-        try {
-           if(transID != 0) {
-              table.truncateTableOnAbort(tblName, transID);
-           }
-        }
-        catch (IOException e) {
-           if (logger.isDebugEnabled()) logger.debug("HbaseClient.registerTruncateOnAbort error" + e);
-           throw e;
-        }
-        return true;
-    }
-
-    private void waitForCompletion(String tblName,HBaseAdmin admin) 
-        throws IOException {
-        // poll for completion of an asynchronous operation
-        boolean keepPolling = true;
-        while (keepPolling) {
-            // status.getFirst() returns the number of regions yet to be updated
-            // status.getSecond() returns the total number of regions
-            Pair<Integer,Integer> status = admin.getAlterStatus(tblName.getBytes());
-
-            keepPolling = (status.getFirst() > 0) && (status.getSecond() > 0);
-            if (keepPolling) {
-                try {
-                    Thread.sleep(2000);  // sleep two seconds or until interrupted
-                }
-                catch (InterruptedException e) {
-                    // ignore the interruption and keep going
-                }    
-            }
-        }
-    }
-
-    public boolean alter(String tblName, Object[] tableOptions, long transID)
-        throws IOException, MasterNotRunningException {
-
-        if (logger.isDebugEnabled()) logger.debug("HBaseClient.alter(" + tblName + ") called.");
-        cleanupCache(tblName);
-        HBaseAdmin admin = new HBaseAdmin(config);
-        HTableDescriptor htblDesc = admin.getTableDescriptor(tblName.getBytes());       
-        HColumnDescriptor[] families = htblDesc.getColumnFamilies();
-
-        String colFam = (String)tableOptions[HBASE_NAME];
-        if (colFam == null)
-            return true; // must have col fam name
-
-        // if the only option specified is col fam name and this family doesnt already
-        // exist, then add it.
-        boolean onlyColFamOptionSpecified = true;
-        for (int i = 0; (onlyColFamOptionSpecified && (i < tableOptions.length)); i++) {
-            if (i == HBASE_NAME)	
-                continue ;
-
-            if (((String)tableOptions[i]).length() != 0)
-                {
-                    onlyColFamOptionSpecified = false;
-                }
-        }
-
-        HColumnDescriptor colDesc = htblDesc.getFamily(colFam.getBytes());
-
-        ChangeFlags status = new ChangeFlags();
-        if (onlyColFamOptionSpecified) {
-            if (colDesc == null) {
-                colDesc = new HColumnDescriptor(colFam);
-                
-                htblDesc.addFamily(colDesc);
-                
-                status.setTableDescriptorChanged();
-            } else
-                return true; // col fam already exists
-        }
-        else {
-            if (colDesc == null)
-                return true; // colDesc must exist
-
-            int defaultVersionsValue = colDesc.getMaxVersions(); 
-
-            status = 
-                setDescriptors(tableOptions,htblDesc /*out*/,colDesc /*out*/, defaultVersionsValue);
-        }
-
-        try {
-            if (transID != 0) {
-                // Transactional alter support
-                table.alter(tblName, tableOptions, transID);
-                if (logger.isDebugEnabled()) logger.debug("HBaseClient.alter(" + tblName + ") called with object length: " + java.lang.reflect.Array.getLength(tableOptions));
-            }
-            else {
-                // the modifyTable and modifyColumn operations are asynchronous,
-                // so we have to have additional code to poll for their completion
-                // (I hear that synchronous versions will be available in HBase 1.x)
-                if (status.tableDescriptorChanged()) {
-                    admin.modifyTable(tblName,htblDesc);
-                    waitForCompletion(tblName,admin);
-                }
-                else if (status.columnDescriptorChanged()) {
-                    admin.modifyColumn(tblName,colDesc);                  
-                    waitForCompletion(tblName,admin);
-                }
-                admin.close();
-            }
-        }
-        catch (IOException e) {
-            if (logger.isDebugEnabled()) logger.debug("HbaseClient.drop  error" + e);
-            throw e;
-        }
-
-        cleanupCache(tblName);
-        return true;
-    }
-
-    public boolean drop(String tblName, long transID)
-             throws MasterNotRunningException, IOException {
-        if (logger.isDebugEnabled()) logger.debug("HBaseClient.drop(" + tblName + ") called.");
-        HBaseAdmin admin = new HBaseAdmin(config);
-        //			admin.disableTableAsync(tblName);
-
-        try {
-           if(transID != 0) {
-              table.dropTable(tblName, transID);
-           }
-           else {
-              admin.disableTable(tblName);
-              admin.deleteTable(tblName);
-              admin.close();
-           }
-        }
-        catch (IOException e) {
-           if (logger.isDebugEnabled()) logger.debug("HbaseClient.drop  error" + e);
-           throw e;
-        }
-
-        return cleanupCache(tblName);
-    }
-
-    public boolean dropAll(String pattern) 
-             throws MasterNotRunningException, IOException {
-            if (logger.isDebugEnabled()) logger.debug("HBaseClient.dropAll(" + pattern + ") called.");
-            HBaseAdmin admin = new HBaseAdmin(config);
-
-	    HTableDescriptor[] htdl = admin.listTables(pattern);
-	    if (htdl == null) // no tables match the given pattern.
-		return true;
-
-	    for (HTableDescriptor htd : htdl) {
-		String tblName = htd.getNameAsString();
-
-                // do not drop DTM log files which have the format: TRAFODION._DTM_.*
-                int idx = tblName.indexOf("TRAFODION._DTM_");
-                if (idx == 0)
-                    continue;
-                
-                //                System.out.println(tblName);
-                admin.disableTable(tblName);
-                admin.deleteTable(tblName);
-	    }
- 	    
-            admin.close();
-            return cleanup();
-    }
-
-    public ByteArrayList listAll(String pattern) 
-             throws MasterNotRunningException, IOException {
-            if (logger.isDebugEnabled()) logger.debug("HBaseClient.listAll(" + pattern + ") called.");
-            HBaseAdmin admin = new HBaseAdmin(config);
-
-            ByteArrayList hbaseTables = new ByteArrayList();
-
-	    HTableDescriptor[] htdl = 
-                (pattern.isEmpty() ? admin.listTables() : admin.listTables(pattern));
-
-	    for (HTableDescriptor htd : htdl) {
-		String tblName = htd.getNameAsString();
-
-                //                System.out.println(tblName);
-
-                byte[] b = tblName.getBytes();
-                hbaseTables.add(b);
-	    }
- 	    
-            admin.close();
-            cleanup();
-            
-            return hbaseTables;
-    }
-
-    public boolean copy(String currTblName, String oldTblName)
-	throws MasterNotRunningException, IOException, SnapshotCreationException, InterruptedException {
-            if (logger.isDebugEnabled()) logger.debug("HBaseClient.copy(" + currTblName + oldTblName + ") called.");
-            HBaseAdmin admin = new HBaseAdmin(config);
-	    
-	    String snapshotName = currTblName + "_SNAPSHOT";
-	    
-	    List<SnapshotDescription> l = new ArrayList<SnapshotDescription>(); 
-	    //	    l = admin.listSnapshots(snapshotName);
-	    l = admin.listSnapshots();
-	    if (! l.isEmpty())
-		{
-		    for (SnapshotDescription sd : l) {
-			//			System.out.println("here 1");
-			//			System.out.println(snapshotName);
-			//			System.out.println(sd.getName());
-			if (sd.getName().compareTo(snapshotName) == 0)
-			    {
-				//				System.out.println("here 2");
-				//			    admin.enableTable(snapshotName);
-				//				System.out.println("here 3");
-				admin.deleteSnapshot(snapshotName);
-				//				System.out.println("here 4");
-			    }
-		    }
-		}
-	    //	    System.out.println(snapshotName);
-	    if (! admin.isTableDisabled(currTblName))
-		admin.disableTable(currTblName);
-	    //	    System.out.println("here 5");
-	    admin.snapshot(snapshotName, currTblName);
-	    admin.cloneSnapshot(snapshotName, oldTblName);
-	    admin.deleteSnapshot(snapshotName);
-	    //	    System.out.println("here 6");
-	    admin.enableTable(currTblName);
-            admin.close();
-            return true;
-    }
-
-    public boolean exists(String tblName)  
-           throws MasterNotRunningException, IOException {
-            if (logger.isDebugEnabled()) logger.debug("HBaseClient.exists(" + tblName + ") called.");
-            HBaseAdmin admin = new HBaseAdmin(config);
-            boolean result = admin.tableExists(tblName);
-            admin.close();
-            return result;
-    }
-
-    public HTableClient getHTableClient(long jniObject, String tblName, 
-                  boolean useTRex) throws IOException 
-    {
-       if (logger.isDebugEnabled()) logger.debug("HBaseClient.getHTableClient(" + tblName
-                         + (useTRex ? ", use TRX" : ", no TRX") + ") called.");
-       HTableClient htable = hTableClientsFree.get(tblName);
-       if (htable == null) {
-          htable = new HTableClient();
-          if (htable.init(tblName, useTRex) == false) {
-             if (logger.isDebugEnabled()) logger.debug("  ==> Error in init(), returning empty.");
-             return null;
-          }
-          if (logger.isDebugEnabled()) logger.debug("  ==> Created new object.");
-          hTableClientsInUse.put(htable.getTableName(), htable);
-          htable.setJniObject(jniObject);
-          return htable;
-       } else {
-            if (logger.isDebugEnabled()) logger.debug("  ==> Returning existing object, removing from container.");
-            hTableClientsInUse.put(htable.getTableName(), htable);
-            htable.resetAutoFlush();
-           htable.setJniObject(jniObject);
-            return htable;
-       }
-    }
-
-
-    public void releaseHTableClient(HTableClient htable) 
-                    throws IOException {
-        if (htable == null)
-            return;
-	                
-        if (logger.isDebugEnabled()) logger.debug("HBaseClient.releaseHTableClient(" + htable.getTableName() + ").");
-        boolean cleanJniObject = false;
-        if (htable.release(cleanJniObject))
-        // If the thread is interrupted, then remove the table from cache
-        // because the table connection is retried when the table is used
-        // next time
-
-           cleanupCache(htable.getTableName());
-        else
-        {
-           if (hTableClientsInUse.remove(htable.getTableName(), htable))
-              hTableClientsFree.put(htable.getTableName(), htable);
-           else
-              if (logger.isDebugEnabled()) logger.debug("Table not found in inUse Pool");
-        }
-    }
-
-    public boolean flushAllTables() throws IOException {
-        if (logger.isDebugEnabled()) logger.debug("HBaseClient.flushAllTables() called.");
-       if (hTableClientsInUse.isEmpty()) {
-          return true;
-        }
-        for (HTableClient htable : hTableClientsInUse.values()) {
-		  htable.flush();
-        }
-	return true; 
-    }
-
-    public boolean grant(byte[] user, byte[] tblName,
-                         Object[] actionCodes) throws IOException {
-        if (logger.isDebugEnabled()) logger.debug("HBaseClient.grant(" + new String(user) + ", "
-                     + new String(tblName) + ") called.");
-		byte[] colFamily = null;
-
-		Permission.Action[] assigned = new Permission.Action[actionCodes.length];
-		for (int i = 0 ; i < actionCodes.length; i++) {
-			String actionCode = (String)actionCodes[i];
-			assigned[i] = Permission.Action.valueOf(actionCode);
-		}
-
-	    //HB98
-	    TableName htblName = TableName.valueOf(new String(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME)
-						   ,new String(tblName));
-            UserPermission userPerm = new UserPermission(user, htblName,
-                                                         colFamily, assigned);
-
-            AccessController accessController = new AccessController();
-	    //HB98 The grant() method is very different in HB98 (commenting out for now)
-            //accessController.grant(userPerm);
-        return true;
-    }
-
-   public boolean revoke(byte[] user, byte[] tblName,
-                          Object[] actionCodes) 
-                     throws IOException {
-        if (logger.isDebugEnabled()) logger.debug("HBaseClient.revoke(" + new String(user) + ", "
-                     + new String(tblName) + ") called.");
-        byte[] colFamily = null;
-
-        Permission.Action[] assigned = new Permission.Action[actionCodes.length];
-        for (int i = 0 ; i < actionCodes.length; i++) {
-            String actionCode = (String)actionCodes[i];
-            assigned[i] = Permission.Action.valueOf(actionCode);
-        }
-
-	    //HB98
-	    TableName htblName = TableName.valueOf(new String(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME)
-						   ,new String(tblName));
-            UserPermission userPerm = new UserPermission(user, htblName,
-                                                         colFamily, assigned);
-
-            AccessController accessController = new AccessController();
-	    
-	    //HB98 The revoke() method is very different in HB98 (commenting out for now)
-            //accessController.revoke(userPerm);
-        return true;
-    }
-
-    // Debugging method to display initial set of KeyValues and sequence
-    // of column qualifiers.
-    private void printQualifiers(HFile.Reader reader, int maxKeys) 
-                 throws IOException {
-      String qualifiers = new String();
-      HFileScanner scanner = reader.getScanner(false, false, false);
-      scanner.seekTo();
-      int kvCount = 0;
-      int nonPuts = 0;
-      do {
-        KeyValue kv = scanner.getKeyValue();
-        System.out.println(kv.toString());
-        if (kv.getType() == KeyValue.Type.Put.getCode())
-          qualifiers = qualifiers + kv.getQualifier()[0] + " ";
-        else
-          nonPuts++;
-      } while (++kvCount < maxKeys && scanner.next());
-      System.out.println("First " + kvCount + " column qualifiers: " + qualifiers);
-      if (nonPuts > 0)
-        System.out.println("Encountered " + nonPuts + " non-PUT KeyValue types.");
-    }
-
-    // Estimates the number of rows still in the MemStores of the regions
-    // associated with the passed table name. The number of bytes in the
-    // MemStores is divided by the passed row size in bytes, which is
-    // derived by comparing the row count for an HFile (which in turn is
-    // derived by the number of KeyValues in the file and the number of
-    // columns in the table) to the size of the HFile.
-    private long estimateMemStoreRows(String tblName, int rowSize)
-                 throws MasterNotRunningException, IOException {
-      if (rowSize == 0)
-        return 0;
-
-      HBaseAdmin admin = new HBaseAdmin(config);
-      HTable htbl = new HTable(config, tblName);
-      long totalMemStoreBytes = 0;
-      try {
-        // Get a set of all the regions for the table.
-        Set<HRegionInfo> tableRegionInfos = htbl.getRegionLocations().keySet();
-        Set tableRegions = new TreeSet(Bytes.BYTES_COMPARATOR);
-        for (HRegionInfo regionInfo : tableRegionInfos) {
-          tableRegions.add(regionInfo.getRegionName());
-        }
-     
-        // Get collection of all servers in the cluster.
-        ClusterStatus clusterStatus = admin.getClusterStatus();
-        Collection<ServerName> servers = clusterStatus.getServers();
-        final long bytesPerMeg = 1024L * 1024L;
-     
-        // For each server, look at each region it contains and see if 
-        // it is in the set of regions for the table. If so, add the
-        // size of its the running total.
-        for (ServerName serverName : servers) {
-          ServerLoad serverLoad = clusterStatus.getLoad(serverName);
-          for (RegionLoad regionLoad: serverLoad.getRegionsLoad().values()) {
-            byte[] regionId = regionLoad.getName();
-            if (tableRegions.contains(regionId)) {
-              long regionMemStoreBytes = bytesPerMeg * regionLoad.getMemStoreSizeMB();
-              if (logger.isDebugEnabled()) logger.debug("Region " + regionLoad.getNameAsString()
-                           + " has MemStore size " + regionMemStoreBytes);
-              totalMemStoreBytes += regionMemStoreBytes;
-            }
-          }
-        }
-      }
-      finally {
-        admin.close();
-      }
-
-      // Divide the total MemStore size by the size of a single row.
-      if (logger.isDebugEnabled()) logger.debug("Estimating " + (totalMemStoreBytes / rowSize)
-                   + " rows in MemStores of table's regions.");
-      return totalMemStoreBytes / rowSize;
-    }
-
-
-    public float getBlockCacheFraction()
-    {
-        float defCacheFraction = 0.4f;
-        return config.getFloat("hfile.block.cache.size",defCacheFraction);
-    }
-    // Estimates row count for tblName by iterating over the HFiles for
-    // the table, extracting the KeyValue entry count from the file's
-    // trailer block, summing the counts, and dividing by the number of
-    // columns in the table. An adjustment is made for the estimated
-    // number of missing (null) values by sampling the first several
-    // hundred KeyValues to see how many are missing.
-    public boolean estimateRowCount(String tblName, int partialRowSize,
-                                    int numCols, long[] rc)
-                   throws MasterNotRunningException, IOException, ClassNotFoundException, URISyntaxException {
-      if (logger.isDebugEnabled()) logger.debug("HBaseClient.estimateRowCount(" + tblName + ") called.");
-
-      final String REGION_NAME_PATTERN = "[0-9a-f]*";
-      final String HFILE_NAME_PATTERN  = "[0-9a-f]*";
-
-      // To estimate incidence of nulls, read the first 500 rows worth
-      // of KeyValues.
-      final int ROWS_TO_SAMPLE = 500;
-      int putKVsSampled = 0;
-      int nonPutKVsSampled = 0;
-      int nullCount = 0;
-      long totalEntries = 0;   // KeyValues in all HFiles for table
-      long totalSizeBytes = 0; // Size of all HFiles for table 
-      long estimatedTotalPuts = 0;
-      boolean more = true;
-
-      // Access the file system to go directly to the table's HFiles.
-      // Create a reader for the file to access the entry count stored
-      // in the trailer block, and a scanner to iterate over a few
-      // hundred KeyValues to estimate the incidence of nulls.
-      long nano1, nano2;
-      nano1 = System.nanoTime();
-      FileSystem fileSystem = FileSystem.get(config);
-      nano2 = System.nanoTime();
-      if (logger.isDebugEnabled()) logger.debug("FileSystem.get() took " + ((nano2 - nano1) + 500000) / 1000000 + " milliseconds.");
-      CacheConfig cacheConf = new CacheConfig(config);
-      String hbaseRootPath = config.get(HConstants.HBASE_DIR).trim();
-      if (hbaseRootPath.charAt(0) != '/')
-        hbaseRootPath = new URI(hbaseRootPath).getPath();
-      if (logger.isDebugEnabled()) logger.debug("hbaseRootPath = " + hbaseRootPath);
-      FileStatus[] fsArr = fileSystem.globStatus(new Path(
-                               hbaseRootPath + "/data/default/" +
-                               tblName + "/" + REGION_NAME_PATTERN +
-                               "/#1/" + HFILE_NAME_PATTERN));
-      for (FileStatus fs : fsArr) {
-        // Make sure the file name conforms to HFile name pattern.
-        if (!StoreFileInfo.isHFile(fs.getPath())) {
-          if (logger.isDebugEnabled()) logger.debug("Skipped file " + fs.getPath() + " -- not a valid HFile name.");
-          continue;
-        }
-        HFile.Reader reader = HFile.createReader(fileSystem, fs.getPath(), cacheConf, config);
-        try {
-          totalEntries += reader.getEntries();
-          totalSizeBytes += reader.length();
-          //printQualifiers(reader, 100);
-          if (ROWS_TO_SAMPLE > 0 &&
-              totalEntries == reader.getEntries()) {  // first file only
-            // Trafodion column qualifiers are ordinal numbers, which
-            // makes it easy to count missing (null) values. We also count
-            // the non-Put KVs (typically delete-row markers) to estimate
-            // their frequency in the full file set.
-            HFileScanner scanner = reader.getScanner(false, false, false);
-            scanner.seekTo();  //position at beginning of first data block
-            byte currQual = 0;
-            byte nextQual;
-            do {
-              KeyValue kv = scanner.getKeyValue();
-              if (kv.getType() == KeyValue.Type.Put.getCode()) {
-                nextQual = kv.getQualifier()[0];
-                if (nextQual <= currQual)
-                  nullCount += ((numCols - currQual)  // nulls at end of this row
-                              + (nextQual - 1));      // nulls at start of next row
-                else
-                  nullCount += (nextQual - currQual - 1);
-                currQual = nextQual;
-                putKVsSampled++;
-              } else {
-                nonPutKVsSampled++;  // don't count these toward the number
-              }                      //   we want to scan
-            } while ((putKVsSampled + nullCount) < (numCols * ROWS_TO_SAMPLE)
-                     && (more = scanner.next()));
-
-            // If all rows were read, count any nulls at end of last row.
-            if (!more && putKVsSampled > 0)
-              nullCount += (numCols - currQual);
-
-            if (logger.isDebugEnabled()) logger.debug("Sampled " + nullCount + " nulls.");
-          }  // code for first file
-        } finally {
-          reader.close(false);
-        }
-      } // for
-
-      long estimatedEntries = (ROWS_TO_SAMPLE > 0
-                                 ? 0               // get from sample data, below
-                                 : totalEntries);  // no sampling, use stored value
-      if (putKVsSampled > 0) // avoid div by 0 if no Put KVs in sample
-        {
-          estimatedTotalPuts = (putKVsSampled * totalEntries) / 
-                               (putKVsSampled + nonPutKVsSampled);
-          estimatedEntries = ((putKVsSampled + nullCount) * estimatedTotalPuts)
-                                   / putKVsSampled;
-        }
-
-      // Calculate estimate of rows in all HFiles of table.
-      rc[0] = (estimatedEntries + (numCols/2)) / numCols; // round instead of truncate
-
-      // Estimate # of rows in MemStores of all regions of table. Pass
-      // a value to divide the size of the MemStore by. Base this on the
-      // ratio of bytes-to-rows in the HFiles, or the actual row size if
-      // the HFiles were empty.
-      int rowSize;
-      if (rc[0] > 0)
-        rowSize = (int)(totalSizeBytes / rc[0]);
-      else {
-        // From Traf metadata we have calculated and passed in part of the row
-        // size, including size of column qualifiers (col names), which are not
-        // known to HBase.  Add to this the length of the fixed part of the
-        // KeyValue format, times the number of columns.
-        int fixedSizePartOfKV = KeyValue.KEYVALUE_INFRASTRUCTURE_SIZE // key len + value len
-                              + KeyValue.KEY_INFRASTRUCTURE_SIZE;     // rowkey & col family len, timestamp, key type
-        rowSize = partialRowSize   // for all cols: row key + col qualifiers + values
-                      + (fixedSizePartOfKV * numCols);
-
-        // Trafodion tables have a single col family at present, so we only look
-        // at the first family name, and multiply its length times the number of
-        // columns. Even if more than one family is used in the future, presumably
-        // they will all be the same short size.
-        HTable htbl = new HTable(config, tblName);
-        HTableDescriptor htblDesc = htbl.getTableDescriptor();
-        HColumnDescriptor[] families = htblDesc.getColumnFamilies();
-        rowSize += (families[0].getName().length * numCols);
-      }
-
-      // Get the estimate of MemStore rows. Add to total after logging
-      // of individual sums below.
-      long memStoreRows = estimateMemStoreRows(tblName, rowSize);
-
-      if (logger.isDebugEnabled()) logger.debug(tblName + " contains a total of " + totalEntries + " KeyValues in all HFiles.");
-      if (logger.isDebugEnabled()) logger.debug("Based on a sample, it is estimated that " + estimatedTotalPuts +
-                   " of these KeyValues are of type Put.");
-      if (putKVsSampled + nullCount > 0)
-        if (logger.isDebugEnabled()) logger.debug("Sampling indicates a null incidence of " + 
-                     (nullCount * 100)/(putKVsSampled + nullCount) +
-                     " percent.");
-      if (logger.isDebugEnabled()) logger.debug("Estimated number of actual values (including nulls) is " + estimatedEntries);
-      if (logger.isDebugEnabled()) logger.debug("Estimated row count in HFiles = " + estimatedEntries +
-                   " / " + numCols + " (# columns) = " + rc[0]);
-      if (logger.isDebugEnabled()) logger.debug("Estimated row count from MemStores = " + memStoreRows);
-
-      rc[0] += memStoreRows;  // Add memstore estimate to total
-      if (logger.isDebugEnabled()) logger.debug("Total estimated row count for " + tblName + " = " + rc[0]);
-      return true;
-    }
-
-
-    /**
-    This method returns node names where Hbase Table regions reside
-    **/
-    public boolean getRegionsNodeName(String tblName, String[] nodeNames)
-                   throws IOException
-    {
-      if (logger.isDebugEnabled()) 
-        logger.debug("HBaseClient.getRegionsNodeName(" + tblName + ") called.");
-
-      HRegionInfo regInfo = null;
-
-
-      HTable htbl = new HTable(config, tblName);
-      if (logger.isDebugEnabled())
-         logger.debug("after HTable call in getRegionsNodeName");
-
-      try {
-        NavigableMap<HRegionInfo, ServerName> locations = htbl.getRegionLocations();
-        if (logger.isDebugEnabled())
-           logger.debug("after htable.getRegionLocations call in getRegionsNodeName");
-
-      
-        String hostName;
-        int regCount = 0;
-
-        for (Map.Entry<HRegionInfo, ServerName> entry: locations.entrySet()) {
-          if (logger.isDebugEnabled()) logger.debug("Entered for loop in getRegionsNodeName");
-          regInfo = entry.getKey();
-          hostName = entry.getValue().getHostname();
-          nodeNames[regCount] = hostName;
-          if (logger.isDebugEnabled()) logger.debug("Hostname for region " + regCount + " is " + hostName);
-          regCount++;
-        }
-      } catch (Exception ie) {
-        if (logger.isDebugEnabled())
-          logger.debug("getRegionLocations throws exception " + ie.getMessage());
-        return false;
-      }
-
-      return true;
-    }
-
-
-
-    /**
-    This method returns index levels and block size of Hbase Table.
-    Index level is read from  Hfiles trailer block. Randomly selects one region and iterates through all Hfiles
-    in the chosen region and gets the maximum index level.
-    Block size is read from HColumnDescriptor.
-    **/
-    public boolean getHbaseTableInfo(String tblName, int[] tblInfo)
-                   throws MasterNotRunningException, IOException, ClassNotFoundException, URISyntaxException {
-
-      if (logger.isDebugEnabled()) logger.debug("HBaseClient.getHbaseTableInfo(" + tblName + ") called.");
-      final String REGION_NAME_PATTERN = "[0-9a-f]*";
-      final String HFILE_NAME_PATTERN  = "[0-9a-f]*";
-
-      // initialize 
-      int indexLevel = 0;
-      int currIndLevel = 0;
-      int blockSize = 0;
-      tblInfo[0] = indexLevel;
-      tblInfo[1] = blockSize;
-
-      // get block size
-      HTable htbl = new HTable(config, tblName);
-      HTableDescriptor htblDesc = htbl.getTableDescriptor();
-      HColumnDescriptor[] families = htblDesc.getColumnFamilies();
-      blockSize = families[0].getBlocksize();
-      tblInfo[1] = blockSize;
-
-      // Access the file system to go directly to the table's HFiles.
-      long nano1 = 0, nano2 = 0;
-      if (logger.isDebugEnabled())
-        nano1 = System.nanoTime();
-      FileSystem fileSystem = FileSystem.get(config);
-
-      if (logger.isDebugEnabled()) {
-        nano2 = System.nanoTime();
-        logger.debug("FileSystem.get() took " + ((nano2 - nano1) + 500000) / 1000000 + " milliseconds.");
-      }
-      CacheConfig cacheConf = new CacheConfig(config);
-      String hbaseRootPath = config.get(HConstants.HBASE_DIR).trim();
-      if (hbaseRootPath.charAt(0) != '/')
-        hbaseRootPath = new URI(hbaseRootPath).getPath();
-      if (logger.isDebugEnabled()) logger.debug("hbaseRootPath = " + hbaseRootPath);
-
-      String regDir = hbaseRootPath + "/data/default/" + 
-                      tblName + "/" + REGION_NAME_PATTERN + "/#1";
-      if (logger.isDebugEnabled()) logger.debug("region dir = " + regDir);
-
-      //get random region from the list of regions and look at all Hfiles in that region
-      FileStatus[] regArr;
-      try {
-        regArr = fileSystem.globStatus(new Path(regDir));
-      } catch (IOException ioe) {
-        if (logger.isDebugEnabled()) logger.debug("fs.globStatus on region throws IOException");
-        return false; // return index level = 0; and  block size
-      }
-      
-      // logging
-      if (logger.isDebugEnabled()) {
-        for (int i =0; i < regArr.length; i++) 
-          logger.debug("Region Path is " + regArr[i].getPath());
-      }
-      // get random region from the region array
-      int regInd = 0;
-      regInd = tblName.hashCode() % regArr.length;
-
-      Path regName = regArr[regInd].getPath();
-      // extract MD5 hash name of random region from its path including colFam name. 
-      // we just need part2 and looks something like /c8fe2d575de62d5d5ffc530bda497bca/#1
-      String strRegPath = regName.toString();
-      String parts[] = strRegPath.split(tblName);
-      String part2 = parts[1];
-
-      // now remove regular expression from the region path.
-      // would look something like /hbase/data/default/<cat.sch.tab>/[0-9a-f]*/#1
-      int j = regDir.indexOf("/[");
-      String regPrefix = regDir.substring(0,j);
-      if (logger.isDebugEnabled()) logger.debug("Region Path prefix = " + regPrefix);
-      String hfilePath = regPrefix + part2 + "/" + HFILE_NAME_PATTERN;
-      
-      if (logger.isDebugEnabled()) logger.debug("Random = " + regInd + ", region is " + regName);
-      if (logger.isDebugEnabled()) logger.debug("Hfile path = " + hfilePath);
-
-      FileStatus[] fsArr;
-      try {
-        fsArr = fileSystem.globStatus(new Path(hfilePath));
-      } catch (IOException ioe) {
-        if (logger.isDebugEnabled()) logger.debug("fs.globStatus on Hfile throws IOException");
-        return false; // return index level = 0; and  block size
-      }
-
-      if (logger.isDebugEnabled()) {
-        for (int i =0; i < fsArr.length; i++)
-          logger.debug("Hfile Path is " + fsArr[i].getPath());
-      }
-     
-      // no Hfiles return from here
-      if (fsArr.length == 0)
-        return true; // return index level = 0; and  block size
-
-      // get maximum index level going through all Hfiles of randomly chosen region
-      if (logger.isDebugEnabled())
-        nano1 = System.nanoTime();
-      for (FileStatus fs : fsArr) {
-        // Make sure the file name conforms to HFile name pattern.
-        if (!StoreFileInfo.isHFile(fs.getPath())) {
-          if (logger.isDebugEnabled()) logger.debug("Skipped file " + fs.getPath() + " -- not a valid HFile name.");
-          continue;
-        }
-
-        // Create a reader for the file to access the index levels stored
-        // in the trailer block
-        HFile.Reader reader = HFile.createReader(fileSystem, fs.getPath(), cacheConf, config);
-        try {
-          FixedFileTrailer trailer = reader.getTrailer();
-          currIndLevel = trailer.getNumDataIndexLevels();
-          // index levels also include data block, should be excluded.
-          if (currIndLevel > 0)
-            currIndLevel = currIndLevel - 1;
-          if (logger.isDebugEnabled()) 
-            logger.debug("currIndLevel = " + currIndLevel+ ", indexLevel = " + indexLevel);
-          if (currIndLevel > indexLevel)
-            indexLevel = currIndLevel;
-       } finally {
-         reader.close(false);
-       }
-      } // for
-
-      if (logger.isDebugEnabled()) {
-        nano2 = System.nanoTime();
-        logger.debug("get index level took " + ((nano2 - nano1) + 500000) / 1000000 + " milliseconds.");
-      }
-
-      tblInfo[0] = indexLevel;
-      if (logger.isDebugEnabled()) {
-        logger.debug("Index Levels for " + tblName + " = " + tblInfo[0]);
-        logger.debug("Block Size for " + tblName + " = " + tblInfo[1]);
-      }
-      
-      return true;
-    }
-
-    void printCell(KeyValue kv) {
-        String rowID = new String(kv.getRow());
-        String colFamily = new String(kv.getFamily());
-        String colName = new String(kv.getQualifier());
-        String colValue = new String(kv.getValue());
-        String row = rowID + ", " + colFamily + ", " + colName + ", "
-            + colValue + ", " + kv.getTimestamp();
-        System.out.println(row);
-    }
-
-    
-  public  HBulkLoadClient getHBulkLoadClient() throws IOException 
-  {
-    if (logger.isDebugEnabled()) logger.debug("HBaseClient.getHBulkLoadClient() called.");
-    HBulkLoadClient hblc = null;
-    try 
-    {
-       hblc = new HBulkLoadClient( config);
-    
-    if (hblc == null)
-      throw new IOException ("hbkc is null");
-    }
-    catch (IOException e)
-    {
-      return null;
-    }
-    
-    return hblc;
-    
-  }
-  public void releaseHBulkLoadClient(HBulkLoadClient hblc) 
-      throws IOException 
-  {
-     if (hblc == null)
-       return;
-          
-      if (logger.isDebugEnabled()) logger.debug("HBaseClient.releaseHBulkLoadClient().");
-      hblc.release();
-   }
-  
-  //returns the latest snapshot name for a table. returns null if table has no snapshots
-  //associated with it
-  public String getLatestSnapshot(String tabName) throws IOException
-  {
-    HBaseAdmin admin = new HBaseAdmin(config);
-    List<SnapshotDescription> snapDescs = admin.listSnapshots();
-    long maxTimeStamp = 0;
-    String latestsnpName = null;
-    for (SnapshotDescription snp :snapDescs )
-    {
-      if (snp.getTable().compareTo(tabName) == 0 && 
-          snp.getCreationTime() > maxTimeStamp)
-      {
-        latestsnpName= snp.getName();
-        maxTimeStamp = snp.getCreationTime();
-      }
-      
-    }
-    admin.close();
-    admin = null;
-    return latestsnpName;
-  }
-  public boolean cleanSnpScanTmpLocation(String pathStr) throws Exception
-  {
-    if (logger.isDebugEnabled()) logger.debug("HbaseClient.cleanSnpScanTmpLocation() - start - Path: " + pathStr);
-    try 
-    {
-      Path delPath = new Path(pathStr );
-      delPath = delPath.makeQualified(delPath.toUri(), null);
-      FileSystem fs = FileSystem.get(delPath.toUri(),config);
-      fs.delete(delPath, true);
-    }
-    catch (IOException e)
-    {
-      if (logger.isDebugEnabled()) logger.debug("HbaseClient.cleanSnpScanTmpLocation() --exception:" + e);
-      throw e;
-    }
-    
-    return true;
-  }
-  private boolean updatePermissionForEntries(FileStatus[] entries, String hbaseUser, FileSystem fs) throws IOException 
-  {
-    if (entries == null) {
-      return true;
-    }
-    
-    for (FileStatus child : entries) {
-      Path path = child.getPath();
-      List<AclEntry> lacl = AclEntry.parseAclSpec("user:" + hbaseUser + ":rwx", true) ;
-      try 
-      {
-        fs.modifyAclEntries(path, lacl);
-      }
-      catch (IOException e)
-      {
-        //if failure just log exception and continue
-        if (logger.isTraceEnabled()) logger.trace("[Snapshot Scan] SnapshotScanHelper.updatePermissionForEntries() exception. " + e);
-      }
-      if (child.isDir()) 
-      {
-        FileStatus[] files = FSUtils.listStatus(fs,path);
-        updatePermissionForEntries(files,hbaseUser, fs);
-      } 
-    }
-    return true;
-  }
-  
-  public boolean setArchivePermissions( String tabName) throws IOException,ServiceException
-  {
-    if (logger.isTraceEnabled()) logger.trace("[Snapshot Scan] SnapshotScanHelper.setArchivePermissions() called. ");
-    Path rootDir = FSUtils.getRootDir(config);
-    FileSystem myfs = FileSystem.get(rootDir.toUri(),config);
-    FileStatus fstatus = myfs.getFileStatus(rootDir);
-    String hbaseUser = fstatus.getOwner(); 
-    assert (hbaseUser != null && hbaseUser.length() != 0);
-    Path tabArcPath = HFileArchiveUtil.getTableArchivePath(config,  TableName.valueOf(tabName));
-    if (tabArcPath == null)
-      return true;
-    List<AclEntry> lacl = AclEntry.parseAclSpec("user:" + hbaseUser + ":rwx", true) ;
-    try
-    {
-      myfs.modifyAclEntries(tabArcPath, lacl);
-    }
-    catch (IOException e)
-    {
-      //if failure just log exception and continue
-      if (logger.isTraceEnabled()) logger.trace("[Snapshot Scan] SnapshotScanHelper.setArchivePermissions() exception. " + e);
-    }
-    FileStatus[] files = FSUtils.listStatus(myfs,tabArcPath);
-    updatePermissionForEntries(files,  hbaseUser, myfs); 
-    return true;
-  }
-
-  public int startGet(long jniObject, String tblName, boolean useTRex, long transID, byte[] rowID,
-                        Object[] columns, long timestamp)
-                        throws IOException {
-      HTableClient htc = getHTableClient(jniObject, tblName, useTRex);
-      return htc.startGet(transID, rowID, columns, timestamp);
-  }
-
-  public int startGet(long jniObject, String tblName, boolean useTRex, long transID, Object[] rowIDs,
-                        Object[] columns, long timestamp)
-                        throws IOException {
-      HTableClient htc = getHTableClient(jniObject, tblName, useTRex);
-      return htc.startGet(transID, rowIDs, columns, timestamp);
-  }
-
-  public int startGet(long jniObject, String tblName, boolean useTRex, long transID, short rowIDLen, Object rowIDs,
-                        Object[] columns)
-                        throws IOException {
-      HTableClient htc = getHTableClient(jniObject, tblName, useTRex);
-      return htc.getRows(transID, rowIDLen, rowIDs, columns);
-  }
-
-  public boolean insertRow(long jniObject, String tblName, boolean useTRex, long transID, byte[] rowID,
-                         Object row,
-                         long timestamp,
-                         boolean checkAndPut,
-                         boolean asyncOperation) throws IOException, InterruptedException, ExecutionException {
-
-      HTableClient htc = getHTableClient(jniObject, tblName, useTRex);
-      boolean ret = htc.putRow(transID, rowID, row, null, null,
-                                checkAndPut, asyncOperation);
-      if (asyncOperation == true)
-         htc.setJavaObject(jniObject);
-      else
-         releaseHTableClient(htc);
-      return ret;
-  }
-
-  public boolean checkAndUpdateRow(long jniObject, String tblName, boolean useTRex, long transID, byte[] rowID,
-                         Object columnsToUpdate,
-                         byte[] columnToCheck, byte[] columnValToCheck,
-                         long timestamp,
-                         boolean asyncOperation) throws IOException, InterruptedException, ExecutionException {
-      boolean checkAndPut = true;
-      HTableClient htc = getHTableClient(jniObject, tblName, useTRex);
-      boolean ret = htc.putRow(transID, rowID, columnsToUpdate, columnToCheck, columnValToCheck,
-                                checkAndPut, asyncOperation);
-      if (asyncOperation == true)
-         htc.setJavaObject(jniObject);
-      else
-         releaseHTableClient(htc);
-      return ret;
-  }
-
-  public boolean insertRows(long jniObject, String tblName, boolean useTRex, long transID, 
-			 short rowIDLen,
-                         Object rowIDs,
-                         Object rows,
-                         long timestamp,
-                         boolean autoFlush,
-                         boolean asyncOperation) throws IOException, InterruptedException, ExecutionException {
-      HTableClient htc = getHTableClient(jniObject, tblName, useTRex);
-      boolean ret = htc.putRows(transID, rowIDLen, rowIDs, rows, timestamp, autoFlush, asyncOperation);
-      if (asyncOperation == true)
-         htc.setJavaObject(jniObject);
-      else
-         releaseHTableClient(htc);
-      return ret;
-  }
-
-  public boolean deleteRow(long jniObject, String tblName, boolean useTRex, long transID, 
-                                 byte[] rowID,
-                                 Object[] columns,
-                                 long timestamp, boolean asyncOperation) throws IOException {
-      HTableClient htc = getHTableClient(jniObject, tblName, useTRex);
-      boolean ret = htc.deleteRow(transID, rowID, columns, timestamp, asyncOperation);
-      if (asyncOperation == true)
-         htc.setJavaObject(jniObject);
-      else
-         releaseHTableClient(htc);
-      return ret;
-  }
-
-  public boolean deleteRows(long jniObject, String tblName, boolean useTRex, long transID, short rowIDLen, Object rowIDs,
-                      long timestamp, 
-                      boolean asyncOperation) throws IOException, InterruptedException, ExecutionException {
-      HTableClient htc = getHTableClient(jniObject, tblName, useTRex);
-      boolean ret = htc.deleteRows(transID, rowIDLen, rowIDs, timestamp, asyncOperation);
-      if (asyncOperation == true)
-         htc.setJavaObject(jniObject);
-      else
-         releaseHTableClient(htc);
-      return ret;
-  }
-
-  public boolean checkAndDeleteRow(long jniObject, String tblName, boolean useTRex, long transID, 
-                                 byte[] rowID,
-                                 byte[] columnToCheck, byte[] colValToCheck,
-                                 long timestamp, boolean asyncOperation) throws IOException {
-      HTableClient htc = getHTableClient(jniObject, tblName, useTRex);
-      boolean ret = htc.checkAndDeleteRow(transID, rowID, columnToCheck, colValToCheck, timestamp);
-      if (asyncOperation == true)
-         htc.setJavaObject(jniObject);
-      else
-         releaseHTableClient(htc);
-      return ret;
-  }
-
-  public boolean  createCounterTable(String tabName,  String famName) throws IOException, MasterNotRunningException
-  {
-    if (logger.isDebugEnabled()) logger.debug("HBaseClient.createCounterTable() - start");
-    HBaseAdmin admin = new HBaseAdmin(config);
-    TableName tn =  TableName.valueOf (tabName);
-    if (admin.tableExists(tabName)) {
-        admin.close();
-        return true;
-    }
-    HTableDescriptor desc = new HTableDescriptor(tn);
-    HColumnDescriptor colDesc = new HColumnDescriptor(famName);
-    // A counter table is non-DTM-transactional.
-    // Use the default maximum versions for MVCC.
-    colDesc.setMaxVersions(DtmConst.MVCC_MAX_VERSION);
-    desc.addFamily(colDesc);
-    admin.createTable(desc);
-    admin.close();
-    if (logger.isDebugEnabled()) logger.debug("HBaseClient.createCounterTable() - end");
-    return true;
-  }
-
-  public long incrCounter(String tabName, String rowId, String famName, String qualName, long incrVal) throws Exception
-  {
-    if (logger.isDebugEnabled()) logger.debug("HBaseClient.incrCounter() - start");
-
-    HTable myHTable = new HTable(config, tabName);
-    long count = myHTable.incrementColumnValue(Bytes.toBytes(rowId), Bytes.toBytes(famName), Bytes.toBytes(qualName), incrVal);
-    myHTable.close();
-    return count;
-  }
-
-}
-    
-
-

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a44823fe/core/sql/executor/HBaseClient_JNI.cpp
----------------------------------------------------------------------
diff --git a/core/sql/executor/HBaseClient_JNI.cpp b/core/sql/executor/HBaseClient_JNI.cpp
index 5135c84..fbe5056 100644
--- a/core/sql/executor/HBaseClient_JNI.cpp
+++ b/core/sql/executor/HBaseClient_JNI.cpp
@@ -69,7 +69,7 @@ ByteArrayList::~ByteArrayList()
 //////////////////////////////////////////////////////////////////////////////
 BAL_RetCode ByteArrayList::init()
 {
-  static char className[]="org/trafodion/sql/HBaseAccess/ByteArrayList";
+  static char className[]="org/trafodion/sql/ByteArrayList";
   BAL_RetCode rc;
   
   if (isInitialized())
@@ -405,7 +405,7 @@ HBaseClient_JNI::~HBaseClient_JNI()
 //////////////////////////////////////////////////////////////////////////////
 HBC_RetCode HBaseClient_JNI::init()
 {
-  static char className[]="org/trafodion/sql/HBaseAccess/HBaseClient";
+  static char className[]="org/trafodion/sql/HBaseClient";
   HBC_RetCode rc;
   
   if (isInitialized())
@@ -432,9 +432,9 @@ HBC_RetCode HBaseClient_JNI::init()
     JavaMethods_[JM_CLEANUP    ].jm_name      = "cleanup";
     JavaMethods_[JM_CLEANUP    ].jm_signature = "()Z";
     JavaMethods_[JM_GET_HTC    ].jm_name      = "getHTableClient";
-    JavaMethods_[JM_GET_HTC    ].jm_signature = "(JLjava/lang/String;Z)Lorg/trafodion/sql/HBaseAccess/HTableClient;";
+    JavaMethods_[JM_GET_HTC    ].jm_signature = "(JLjava/lang/String;Z)Lorg/trafodion/sql/HTableClient;";
     JavaMethods_[JM_REL_HTC    ].jm_name      = "releaseHTableClient";
-    JavaMethods_[JM_REL_HTC    ].jm_signature = "(Lorg/trafodion/sql/HBaseAccess/HTableClient;)V";
+    JavaMethods_[JM_REL_HTC    ].jm_signature = "(Lorg/trafodion/sql/HTableClient;)V";
     JavaMethods_[JM_CREATE     ].jm_name      = "create";
     JavaMethods_[JM_CREATE     ].jm_signature = "(Ljava/lang/String;[Ljava/lang/Object;Z)Z";
     JavaMethods_[JM_CREATEK    ].jm_name      = "createk";
@@ -448,7 +448,7 @@ HBC_RetCode HBaseClient_JNI::init()
     JavaMethods_[JM_DROP_ALL       ].jm_name      = "dropAll";
     JavaMethods_[JM_DROP_ALL       ].jm_signature = "(Ljava/lang/String;)Z";
     JavaMethods_[JM_LIST_ALL       ].jm_name      = "listAll";
-    JavaMethods_[JM_LIST_ALL       ].jm_signature = "(Ljava/lang/String;)Lorg/trafodion/sql/HBaseAccess/ByteArrayList;";
+    JavaMethods_[JM_LIST_ALL       ].jm_signature = "(Ljava/lang/String;)Lorg/trafodion/sql/ByteArrayList;";
     JavaMethods_[JM_COPY       ].jm_name      = "copy";
     JavaMethods_[JM_COPY       ].jm_signature = "(Ljava/lang/String;Ljava/lang/String;)Z";
     JavaMethods_[JM_EXISTS     ].jm_name      = "exists";
@@ -460,11 +460,11 @@ HBC_RetCode HBaseClient_JNI::init()
     JavaMethods_[JM_FLUSHALL   ].jm_name      = "flushAllTables";
     JavaMethods_[JM_FLUSHALL   ].jm_signature = "()Z";
     JavaMethods_[JM_GET_HBLC   ].jm_name      = "getHBulkLoadClient";
-    JavaMethods_[JM_GET_HBLC   ].jm_signature = "()Lorg/trafodion/sql/HBaseAccess/HBulkLoadClient;";
+    JavaMethods_[JM_GET_HBLC   ].jm_signature = "()Lorg/trafodion/sql/HBulkLoadClient;";
     JavaMethods_[JM_EST_RC     ].jm_name      = "estimateRowCount";
     JavaMethods_[JM_EST_RC     ].jm_signature = "(Ljava/lang/String;II[J)Z";
     JavaMethods_[JM_REL_HBLC   ].jm_name      = "releaseHBulkLoadClient";
-    JavaMethods_[JM_REL_HBLC   ].jm_signature = "(Lorg/trafodion/sql/HBaseAccess/HBulkLoadClient;)V";
+    JavaMethods_[JM_REL_HBLC   ].jm_signature = "(Lorg/trafodion/sql/HBulkLoadClient;)V";
     JavaMethods_[JM_GET_CAC_FRC].jm_name      = "getBlockCacheFraction";
     JavaMethods_[JM_GET_CAC_FRC].jm_signature = "()F";
     JavaMethods_[JM_GET_LATEST_SNP].jm_name      = "getLatestSnapshot";
@@ -1884,7 +1884,7 @@ static const char* const hblcErrorEnumStr[] = ///need to update content
 };
 HBLC_RetCode HBulkLoadClient_JNI::init()
 {
-  static char className[]="org/trafodion/sql/HBaseAccess/HBulkLoadClient";
+  static char className[]="org/trafodion/sql/HBulkLoadClient";
   HBLC_RetCode rc;
 
   if (isInitialized())
@@ -3545,7 +3545,7 @@ HTableClient_JNI::~HTableClient_JNI()
 //////////////////////////////////////////////////////////////////////////////
 HTC_RetCode HTableClient_JNI::init()
 {
-  static char className[]="org/trafodion/sql/HBaseAccess/HTableClient";
+  static char className[]="org/trafodion/sql/HTableClient";
   HTC_RetCode rc;
   
   if (isInitialized())
@@ -3578,7 +3578,7 @@ HTC_RetCode HTableClient_JNI::init()
     JavaMethods_[JM_GET_HTNAME ].jm_name      = "getTableName";
     JavaMethods_[JM_GET_HTNAME ].jm_signature = "()Ljava/lang/String;";
     JavaMethods_[JM_GETENDKEYS ].jm_name      = "getEndKeys";
-    JavaMethods_[JM_GETENDKEYS ].jm_signature = "()Lorg/trafodion/sql/HBaseAccess/ByteArrayList;";
+    JavaMethods_[JM_GETENDKEYS ].jm_signature = "()Lorg/trafodion/sql/ByteArrayList;";
     JavaMethods_[JM_FLUSHT     ].jm_name      = "flush";
     JavaMethods_[JM_FLUSHT     ].jm_signature = "()Z";
     JavaMethods_[JM_SET_WB_SIZE ].jm_name      = "setWriteBufferSize";
@@ -3590,7 +3590,7 @@ HTC_RetCode HTableClient_JNI::init()
     JavaMethods_[JM_COMPLETE_PUT ].jm_name      = "completeAsyncOperation";
     JavaMethods_[JM_COMPLETE_PUT ].jm_signature = "(I[Z)Z";
     JavaMethods_[JM_GETBEGINKEYS ].jm_name      = "getStartKeys";
-    JavaMethods_[JM_GETBEGINKEYS ].jm_signature = "()Lorg/trafodion/sql/HBaseAccess/ByteArrayList;";
+    JavaMethods_[JM_GETBEGINKEYS ].jm_signature = "()Lorg/trafodion/sql/ByteArrayList;";
    
     rc = (HTC_RetCode)JavaObjectInterface::init(className, javaClass_, JavaMethods_, (Int32)JM_LAST, javaMethodsInitialized_);
     javaMethodsInitialized_ = TRUE;
@@ -4277,7 +4277,7 @@ HiveClient_JNI::~HiveClient_JNI()
 //////////////////////////////////////////////////////////////////////////////
 HVC_RetCode HiveClient_JNI::init()
 {
-  static char className[]="org/trafodion/sql/HBaseAccess/HiveClient";
+  static char className[]="org/trafodion/sql/HiveClient";
   HVC_RetCode rc;
   
   if (isInitialized())
@@ -4752,7 +4752,7 @@ void HiveClient_JNI::logIt(const char* str)
 extern "C" {
 #endif
 
-JNIEXPORT jint JNICALL Java_org_trafodion_sql_HBaseAccess_HTableClient_setResultInfo
+JNIEXPORT jint JNICALL Java_org_trafodion_sql_HTableClient_setResultInfo
   (JNIEnv *jenv, jobject jobj, jlong jniObject, 
 	jintArray jKvValLen, jintArray jKvValOffset, 
         jintArray jKvQualLen, jintArray jKvQualOffset,
@@ -4771,7 +4771,7 @@ JNIEXPORT jint JNICALL Java_org_trafodion_sql_HBaseAccess_HTableClient_setResult
    return 0;
 }
 
-JNIEXPORT jint JNICALL Java_org_trafodion_sql_HBaseAccess_HTableClient_setJavaObject
+JNIEXPORT jint JNICALL Java_org_trafodion_sql_HTableClient_setJavaObject
   (JNIEnv *jenv, jobject jobj, jlong jniObject)
 {
    HTableClient_JNI *htc = (HTableClient_JNI *)jniObject;
@@ -4779,7 +4779,7 @@ JNIEXPORT jint JNICALL Java_org_trafodion_sql_HBaseAccess_HTableClient_setJavaOb
    return 0;
 }
 
-JNIEXPORT void JNICALL Java_org_trafodion_sql_HBaseAccess_HTableClient_cleanup
+JNIEXPORT void JNICALL Java_org_trafodion_sql_HTableClient_cleanup
   (JNIEnv *jenv, jobject jobj, jlong jniObject)
 {
    HTableClient_JNI *htc = (HTableClient_JNI *)jniObject;

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a44823fe/core/sql/executor/HBaseClient_JNI.h
----------------------------------------------------------------------
diff --git a/core/sql/executor/HBaseClient_JNI.h b/core/sql/executor/HBaseClient_JNI.h
index 6941069..e4129d1 100644
--- a/core/sql/executor/HBaseClient_JNI.h
+++ b/core/sql/executor/HBaseClient_JNI.h
@@ -34,7 +34,7 @@
 #include "Hbase_types.h"
 #include "ExpHbaseDefs.h"
 #include "NAMemory.h"
-#include "HTableClient.h"
+#include "org_trafodion_sql_HTableClient.h"
 
 // forward declare
 class ExHbaseAccessStats;


Mime
View raw message