fox deleting large columns in Fs store

Author: Oleg Tarakanov

doradus-server/src/main/java/com/dell/doradus/service/db/fs/FsMemStore.java

@@ -10,12 +10,10 @@
 
 public class FsMemStore {
     private String m_name;
-    private FsDataStore m_dataStore;
     private HashMap<BSTR, FsRow> m_rows = new HashMap<>();
 
-    public FsMemStore(String name, FsDataStore dataStore) {
+    public FsMemStore(String name) {
         m_name = name;
-        m_dataStore = dataStore;
     }
 
     public String getName() { return m_name; }
@@ -27,7 +25,7 @@ public FsMemStore(String name, FsDataStore dataStore) {
     public FsRow getOrCreateRow(BSTR row) {
         FsRow r = m_rows.get(row);
         if(r == null) {
-            r = new FsRow(row, m_dataStore);
+            r = new FsRow(row);
             m_rows.put(row, r);
         }
         return r;

doradus-server/src/main/java/com/dell/doradus/service/db/fs/FsMemTable.java

@@ -10,8 +10,8 @@
 public class FsMemTable {
     private FsMemStore m_memStore;
 
-    public FsMemTable(String store, FsDataStore dataStore) {
-        m_memStore = new FsMemStore(store, dataStore);
+    public FsMemTable(String store) {
+        m_memStore = new FsMemStore(store);
     }
 
     public void deleteRow(BSTR row) {

doradus-server/src/main/java/com/dell/doradus/service/db/fs/FsRow.java

@@ -10,15 +10,13 @@
 
 public class FsRow implements Comparable<FsRow> {
     private BSTR m_name;
-    private FsDataStore m_dataStore;
     private HashMap<BSTR, FsColumn> m_columnsMap = new HashMap<>();
     private List<FsColumn> m_columnsList = new ArrayList<>();
     private boolean m_bSorted = true;
     private boolean m_bDeleted;
 
-    public FsRow(BSTR name, FsDataStore dataStore) {
+    public FsRow(BSTR name) {
         m_name = name;
-        m_dataStore = dataStore;
     }
 
     public BSTR getName() { return m_name; }
@@ -81,9 +79,6 @@ public FsColumn createColumn(int operation, BSTR columnName, byte[] value) {
             m_columnsList.add(c);
             m_bSorted = false;
         } else {
-            if(c.isExternalValue() && operation != FsMutation.UPDATE_LARGE_COLUMN) {
-                m_dataStore.delete(m_name.toString(), columnName.toString());
-            }
             c.set(operation, columnName, value);
         }
         return c;
@@ -94,7 +89,6 @@ public void deleteRow() {
         m_columnsList.clear();
         m_bSorted = true;
         m_bDeleted = true;
-        m_dataStore.deleteRow(m_name.toString());
     }
 
     public boolean isDeleted() { return m_bDeleted; }

doradus-server/src/main/java/com/dell/doradus/service/db/fs/FsStore.java

@@ -38,7 +38,7 @@ public FsStore(File tenant, String storeName) {
             if(!m_root.exists()) m_root.mkdir();
             m_logFile = new File(m_root, "Log");
             m_dataStore = new FsDataStore(m_root);
-            m_memTable = new FsMemTable(storeName, m_dataStore);
+            m_memTable = new FsMemTable(storeName);
             for(File f: m_root.listFiles()) {
                 if(f.getName().startsWith("table") && !f.getName().endsWith(".idx")) {
                     m_tables.add(new FsTable(f, m_dataStore));
@@ -100,8 +100,18 @@ public void addMutations(Map<String, List<DColumn>> columnUpdates, Map<String, L
                 if(m_logFile.length() > LOGFILE_THRESHOLD) {
                     flushTable();
                 }
+                
+                //delete all files after we committed the transactions
+                for(String row: columnDeletes.keySet()) {
+                    for(String columnName: columnDeletes.get(row)) {
+                        m_dataStore.delete(row, columnName);
+                    }
+                }
+                for(String row: rowDeletes) {
+                    m_dataStore.deleteRow(row);
+                }
             }
-        
+            
         }catch(IOException e) {
             throw new RuntimeException(e);
         }
@@ -132,7 +142,7 @@ public void flushTable() throws IOException {
         index.write(indexFile);
         m_tables.add(new FsTable(tableFile, m_dataStore));
         m_logFile.delete();
-        m_memTable = new FsMemTable(m_name, m_dataStore);
+        m_memTable = new FsMemTable(m_name);
         m_log.info("Store {} flushed table in {}", m_name, t);
     }
 

doradus-server/src/main/java/com/dell/doradus/service/db/fs/FsTable.java

@@ -15,7 +15,6 @@
 public class FsTable {
     private FsTableIndex m_index;
     private File m_tableFile;
-    private FsDataStore m_dataStore;
 
     private List<FsColumn> m_lastRead;
     private long m_lastPosition = -1;
@@ -83,7 +82,7 @@ public void getColumns(BSTR rowKey, FsReadColumns columns, FsColumn startColumn,
 
     public void getRows(Set<FsRow> rows, BSTR continuationToken) {
         for(FsTableIndex.Row row: m_index.getRows()) {
-            FsRow fsr = new FsRow(row.getKey(), m_dataStore);
+            FsRow fsr = new FsRow(row.getKey());
             if(row.isDeleted()) fsr.deleteRow();
             if(rows.contains(fsr)) continue;
             if(continuationToken != null && continuationToken.compareTo(fsr.getName()) >= 0) continue;