Fix #741 Remove the usage of view

smart-engine/src/main/java/org/smartdata/server/engine/cmdlet/HazelcastExecutorService.java

@@ -67,7 +67,7 @@ public HazelcastExecutorService(CmdletManager cmdletManager) {
   }
 
   private void initChannels() {
-    for (Member worker : HazelcastUtil.getWorkerMembers(this.instance)) {
+    for (Member worker : HazelcastUtil.getWorkerMembers(instance)) {
       ITopic<Serializable> topic = instance.getTopic(WORKER_TOPIC_PREFIX + worker.getUuid());
       this.masterToWorkers.put(worker.getUuid(), topic);
       this.scheduledCmdlets.put(worker.getUuid(), new HashSet<Long>());
@@ -76,7 +76,7 @@ private void initChannels() {
 
   public List<StandbyServerInfo> getStandbyServers() {
     List<StandbyServerInfo> infos = new ArrayList<>();
-    for (Member worker : HazelcastUtil.getWorkerMembers(this.instance)) {
+    for (Member worker : HazelcastUtil.getWorkerMembers(instance)) {
       infos.add(new StandbyServerInfo(worker.getUuid(), worker.getAddress().toString()));
     }
     return infos;
@@ -95,10 +95,10 @@ public boolean canAcceptMore() {
   @Override
   public void execute(LaunchCmdlet cmdlet) {
     String[] members = masterToWorkers.keySet().toArray(new String[0]);
-    String memeber = members[random.nextInt() % members.length];
-    masterToWorkers.get(memeber).publish(cmdlet);
-    scheduledCmdlets.get(memeber).add(cmdlet.getCmdletId());
-    LOG.info(String.format("Executing cmdlet %s on worker %s", cmdlet.getCmdletId(), members));
+    String member = members[random.nextInt() % members.length];
+    masterToWorkers.get(member).publish(cmdlet);
+    scheduledCmdlets.get(member).add(cmdlet.getCmdletId());
+    LOG.info("Executing cmdlet {} on worker {}", cmdlet.getCmdletId(), members);
   }
 
   @Override

smart-engine/src/main/java/org/smartdata/server/engine/rule/RuleExecutor.java

@@ -209,7 +209,7 @@ private List<String> getAccessCountTablesDuringLast(long lastInterval) {
           + accTables.size() + " tables:");
       int idx = 1;
       for (AccessCountTable t : accTables) {
-        LOG.debug(idx + ".  " + (t.isView() ? " [VIEW] " : "        ")
+        LOG.debug(idx + ".  " + (t.isEphemeral() ? " [TABLE] " : "        ")
             + t.getTableName() + " ");
       }
     }
@@ -220,8 +220,8 @@ private List<String> getAccessCountTablesDuringLast(long lastInterval) {
 
     for (AccessCountTable t : accTables) {
       tableNames.add(t.getTableName());
-      if (t.isView()) {
-        dynamicCleanups.push("DROP VIEW IF EXISTS " + t.getTableName() + ";");
+      if (t.isEphemeral()) {
+        dynamicCleanups.push("DROP TABLE IF EXISTS " + t.getTableName() + ";");
       }
     }
     return tableNames;

smart-metastore/src/main/java/org/smartdata/metastore/MetaStore.java

@@ -291,8 +291,8 @@ public synchronized List<FileAccessInfo> getHotFiles(
         throw new MetaStoreException(e);
       } finally {
         for (AccessCountTable accessCountTable : tables) {
-          if (accessCountTable.isView()) {
-            this.dropView(accessCountTable.getTableName());
+          if (accessCountTable.isEphemeral()) {
+            this.dropTable(accessCountTable.getTableName());
           }
         }
       }
@@ -470,11 +470,11 @@ public CachedFileStatus getCachedFileStatus(
     }
   }
 
-  public void createProportionView(AccessCountTable dest,
+  public void createProportionTable(AccessCountTable dest,
       AccessCountTable source)
       throws MetaStoreException {
     try {
-      accessCountDao.createProportionView(dest, source);
+      accessCountDao.createProportionTable(dest, source);
     } catch (Exception e) {
       throw new MetaStoreException(e);
     }
@@ -489,15 +489,6 @@ public void dropTable(String tableName) throws MetaStoreException {
     }
   }
 
-  public void dropView(String viewName) throws MetaStoreException {
-    try {
-      LOG.debug("Drop view = {}", viewName);
-      metaStoreHelper.dropView(viewName);
-    } catch (Exception e) {
-      throw new MetaStoreException(e);
-    }
-  }
-
   public void execute(String sql) throws MetaStoreException {
     try {
       LOG.debug("Execute sql = {}", sql);

smart-metastore/src/main/java/org/smartdata/metastore/dao/AccessCountDao.java

@@ -133,15 +133,15 @@ private String getUnionStatement(List<AccessCountTable> tables) {
     return union.toString();
   }
 
-  public void createProportionView(AccessCountTable dest, AccessCountTable source)
+  public void createProportionTable(AccessCountTable dest, AccessCountTable source)
       throws SQLException {
     JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
     double percentage =
         ((double) dest.getEndTime() - dest.getStartTime())
             / (source.getEndTime() - source.getStartTime());
     String sql =
         String.format(
-            "CREATE VIEW %s AS SELECT %s, ROUND(%s.%s * %s) AS %s FROM %s",
+            "CREATE TABLE %s AS SELECT %s, ROUND(%s.%s * %s) AS %s FROM %s",
             dest.getTableName(),
             AccessCountDao.FILE_FIELD,
             source.getTableName(),

smart-metastore/src/main/java/org/smartdata/metastore/dao/AccessCountTable.java

@@ -28,23 +28,23 @@ public class AccessCountTable {
   private final Long startTime;
   private final Long endTime;
   private final TimeGranularity granularity;
-  private final boolean isView;
+  private final boolean isEphemeral;
 
   public AccessCountTable(Long startTime, Long endTime) {
     this(startTime, endTime, false);
   }
 
-  public AccessCountTable(Long startTime, Long endTime, boolean isView) {
-    this(getTableName(startTime, endTime, isView), startTime, endTime, isView);
+  public AccessCountTable(Long startTime, Long endTime, boolean isEphemeral) {
+    this(getTableName(startTime, endTime, isEphemeral), startTime, endTime, isEphemeral);
   }
 
   @VisibleForTesting
-  protected AccessCountTable(String name, Long startTime, Long endTime, boolean isView) {
+  protected AccessCountTable(String name, Long startTime, Long endTime, boolean isEphemeral) {
     this.startTime = startTime;
     this.endTime = endTime;
     this.granularity = TimeUtils.getGranularity(endTime - startTime);
     this.tableName = name;
-    this.isView = isView;
+    this.isEphemeral = isEphemeral;
   }
 
   public String getTableName() {
@@ -95,7 +95,7 @@ public String toString() {
         this.tableName, this.startTime, this.endTime, this.granularity);
   }
 
-  public boolean isView() {
-    return isView;
+  public boolean isEphemeral() {
+    return isEphemeral;
   }
 }

smart-metastore/src/main/java/org/smartdata/metastore/dao/AccessCountTableManager.java

@@ -156,7 +156,7 @@ private static List<AccessCountTable> getTablesDuring(
           // table that already exists, so this situation should be avoided.
           if (!tableExists(tableDeques, startTime, table.getEndTime())) {
             AccessCountTable splitTable = new AccessCountTable(startTime, table.getEndTime(), true);
-            metaStore.createProportionView(splitTable, table);
+            metaStore.createProportionTable(splitTable, table);
             results.add(splitTable);
             startTime = table.getEndTime();
           }

smart-metastore/src/test/java/org/smartdata/metastore/dao/TestAccessCountTableManager.java

@@ -326,7 +326,7 @@ public void testGetTablesCornerCase2() throws MetaStoreException {
       Constants.ONE_MINUTE_IN_MILLIS);
     Assert.assertTrue(result.size() == 3);
     Assert.assertTrue(result.get(0).equals(firstFiveSeconds));
-    Assert.assertFalse(result.get(0).isView());
+    Assert.assertFalse(result.get(0).isEphemeral());
     Assert.assertTrue(result.get(1).equals(secondFiveSeconds));
     Assert.assertTrue(result.get(2).equals(thirdFiveSeconds));
   }

smart-server/src/main/java/org/smartdata/server/SmartDaemon.java

@@ -53,7 +53,7 @@ public void becomeActive() {
     if (this.hazelcastWorker != null) {
       this.hazelcastWorker.stop();
     }
-    //SmartServer.main(args);
+    SmartServer.main(args);
   }
 
   public static void main(String[] args) {