removing obsolete version check

Merck · Jun 13, 2017 · d80bb94 · d80bb94
1 parent 30b8967
commit d80bb94
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git a/common/src/main/java/com/msd/gin/halyard/common/HalyardTableUtils.java b/common/src/main/java/com/msd/gin/halyard/common/HalyardTableUtils.java
@@ -104,8 +104,6 @@ public final class HalyardTableUtils {
     private static final DataBlockEncoding DEFAULT_DATABLOCK_ENCODING = DataBlockEncoding.PREFIX;
     private static final String REGION_MAX_FILESIZE = "10000000000";
     private static final String REGION_SPLIT_POLICY = "org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy";
-    private static final String HALYARD_VERSION_ATTRIBUTE = "HALYARD_VERSION";
-    private static final String HALYARD_VERSION = "1";
 
     private static final ThreadLocal<MessageDigest> MD = new ThreadLocal<MessageDigest>(){
         @Override
@@ -153,18 +151,12 @@ public static HTable getTable(Configuration config, String tableName, boolean cr
                     if (!admin.tableExists(TableName.valueOf(tableName))) {
                         HTableDescriptor td = new HTableDescriptor(TableName.valueOf(tableName));
                         td.addFamily(createColumnFamily());
-                        td.setValue(HALYARD_VERSION_ATTRIBUTE, HALYARD_VERSION);
                         admin.createTable(td, splits);
                     }
                 }
             }
         }
         HTable table = new HTable(cfg, tableName);
-        String version  = table.getTableDescriptor().getValue(HALYARD_VERSION_ATTRIBUTE);
-        if (!HALYARD_VERSION.equals(version)) {
-            table.close();
-            throw new IllegalArgumentException("Table " + tableName + " is not compatible, expected " + HALYARD_VERSION_ATTRIBUTE + "=" + HALYARD_VERSION + ", however received " + version);
-        }
         table.setAutoFlushTo(false);
         return table;
     }

diff --git a/common/src/test/java/com/msd/gin/halyard/common/HalyardTableUtilsTest.java b/common/src/test/java/com/msd/gin/halyard/common/HalyardTableUtilsTest.java
@@ -124,18 +124,6 @@ public void testTruncateTable() throws Exception {
         }
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testInvalidHalyardVersion() throws Exception {
-        try (Connection con = ConnectionFactory.createConnection(HBaseServerTestInstance.getInstanceConfig())) {
-            try (Admin admin = con.getAdmin()) {
-                HTableDescriptor desc = new HTableDescriptor(TableName.valueOf("InvalidTable"));
-                desc.addFamily(new HColumnDescriptor("e"));
-                admin.createTable(desc);
-            }
-        }
-        HalyardTableUtils.getTable(HBaseServerTestInstance.getInstanceConfig(), "InvalidTable", false, 0);
-    }
-
     @Test
     public void testNewInstance() {
         new HalyardTableUtils();