Feat: IMPORT SYNOPSIS ~ AS FILE / TABLE / DEFAULT

Author: taewhi

traindb-catalog/src/main/java/traindb/catalog/CatalogContext.java

@@ -95,7 +95,8 @@ MSynopsis createSynopsis(String synopsisName, String modelName, Integer rows, Do
 
  void dropSynopsis(String name) throws CatalogException;
 
- void importSynopsis(String synopsisName, JSONObject exportMetadata) throws CatalogException;
+ void importSynopsis(String synopsisName, boolean isExternal, JSONObject exportMetadata)
+ throws CatalogException;
 
  void renameSynopsis(String synopsisName, String newSynopsisName) throws CatalogException;
 

traindb-catalog/src/main/java/traindb/catalog/JDOCatalogContext.java

@@ -445,7 +445,7 @@ public void dropSynopsis(String name) throws CatalogException {
  }
 
  @Override
- public void importSynopsis(String synopsisName, JSONObject exportMetadata)
+ public void importSynopsis(String synopsisName, boolean isExternal, JSONObject exportMetadata)
  throws CatalogException {
  try {
  String schemaName = (String) exportMetadata.get("schemaName");
@@ -462,7 +462,6 @@ public void importSynopsis(String synopsisName, JSONObject exportMetadata)
 
  Integer rows = ((Long) exportMetadata.get("rows")).intValue();
  Double ratio = (Double) exportMetadata.get("ratio");
- boolean isExternal = (Boolean) exportMetadata.get("external");
 
  MSynopsis mSynopsis = new MSynopsis(synopsisName, rows, ratio, "-", schemaName, tableName,
  columnNames, isExternal, mTable);

traindb-core/src/main/antlr4/traindb/sql/TrainDBSql.g4

@@ -166,7 +166,7 @@ exportToClause
  ;
 
 importSynopsis
- : K_IMPORT K_SYNOPSIS synopsisName K_FROM ( synopsisBinaryString | K_FILE filenameString )?
+ : K_IMPORT K_SYNOPSIS synopsisName synopsisTypeClause? K_FROM ( synopsisBinaryString | K_FILE filenameString )?
  ;
 
 analyzeSynopsis

traindb-core/src/main/java/traindb/engine/TrainDBQueryEngine.java

@@ -647,7 +647,7 @@ public void createSynopsis(String synopsisName, TrainDBSqlCommand.SynopsisType s
  T_tracer.closeTaskTime("SUCCESS");
 
  if (synopsisType == TrainDBSqlCommand.SynopsisType.TABLE && conn.isStandalone()) {
- throw new TrainDBException("cannot create synopsis table without source DBMS connection.");
+ throw new TrainDBException("cannot create synopsis as table without source DBMS connection.");
  }
 
  T_tracer.openTaskTime("generate synopsis");
@@ -1364,8 +1364,9 @@ public TrainDBListResultSet exportSynopsis(String synopsisName, String exportFil
  }
 
  @Override
- public TrainDBListResultSet importSynopsis(String synopsisName, String synopsisBinaryString,
- String importFilename) throws Exception {
+ public TrainDBListResultSet importSynopsis(String synopsisName,
+ TrainDBSqlCommand.SynopsisType synopsisType, String synopsisBinaryString,
+ String importFilename) throws Exception {
  T_tracer.startTaskTracer("import synopsis " + synopsisName);
 
  T_tracer.openTaskTime("find : synopsis");
@@ -1396,11 +1397,20 @@ public TrainDBListResultSet importSynopsis(String synopsisName, String synopsisB
  JSONObject json = (JSONObject) parser.parse(metadata);
  T_tracer.closeTaskTime("SUCCESS");
 
+ boolean isExternal = false;
+ if (synopsisType == TrainDBSqlCommand.SynopsisType.FILE
+ || (synopsisType == TrainDBSqlCommand.SynopsisType.DEFAULT
+ && (Boolean) json.get("external"))) {
+ isExternal = true;
+ }
+ if (conn.isStandalone() && !isExternal) {
+ throw new TrainDBException("cannot import synopsis as table without source DBMS connection.");
+ }
+
  T_tracer.openTaskTime("insert synopsis info");
- catalogContext.importSynopsis(synopsisName, json);
+ catalogContext.importSynopsis(synopsisName, isExternal, json);
  T_tracer.closeTaskTime("SUCCESS");
 
- boolean isExternal = conn.isStandalone();
  try {
  T_tracer.openTaskTime("create synopsis table");
  String schemaName = (String) json.get("schemaName");
@@ -1444,7 +1454,7 @@ public TrainDBListResultSet importSynopsis(String synopsisName, String synopsisB
  // ignore
  }
 
- String msg = "failed to create synopsis " + synopsisName;
+ String msg = "failed to import synopsis " + synopsisName;
  T_tracer.closeTaskTime(msg);
  T_tracer.endTaskTracer();
 

traindb-core/src/main/java/traindb/sql/TrainDBSql.java

@@ -169,7 +169,8 @@ public static TrainDBListResultSet run(TrainDBSqlCommand command, TrainDBSqlRunn
  case IMPORT_SYNOPSIS:
  TrainDBSqlImportSynopsis importSynopsis = (TrainDBSqlImportSynopsis) command;
  return runner.importSynopsis(importSynopsis.getSynopsisName(),
- importSynopsis.getSynopsisBinaryString(), importSynopsis.getImportFilename());
+ importSynopsis.getSynopsisType(), importSynopsis.getSynopsisBinaryString(),
+ importSynopsis.getImportFilename());
  case ALTER_SYNOPSIS_RENAME: {
  TrainDBSqlAlterSynopsis alterSynopsis = (TrainDBSqlAlterSynopsis) command;
  runner.renameSynopsis(alterSynopsis.getSynopsisName(), alterSynopsis.getNewSynopsisName());
@@ -418,6 +419,14 @@ public void exitExportSynopsis(TrainDBSqlParser.ExportSynopsisContext ctx) {
  @Override
  public void exitImportSynopsis(TrainDBSqlParser.ImportSynopsisContext ctx) {
  String synopsisName = ctx.synopsisName().getText();
+ TrainDBSqlCommand.SynopsisType synopsisType = TrainDBSqlCommand.SynopsisType.DEFAULT;
+ if (ctx.synopsisTypeClause() != null) {
+ if (ctx.synopsisTypeClause().K_TABLE() != null) {
+ synopsisType = TrainDBSqlCommand.SynopsisType.TABLE;
+ } else if (ctx.synopsisTypeClause().K_FILE() != null) {
+ synopsisType = TrainDBSqlCommand.SynopsisType.FILE;
+ }
+ }
  String synopsisBinaryString = null;
  String importFilename = null;
  if (ctx.synopsisBinaryString() != null) {
@@ -426,7 +435,7 @@ public void exitImportSynopsis(TrainDBSqlParser.ImportSynopsisContext ctx) {
  importFilename = ctx.filenameString().getText();
  }
  LOG.debug("IMPORT SYNOPSIS: name=" + synopsisName);
- commands.add(new TrainDBSqlImportSynopsis(synopsisName, synopsisBinaryString,
+ commands.add(new TrainDBSqlImportSynopsis(synopsisName, synopsisType, synopsisBinaryString,
  importFilename));
  }
 

traindb-core/src/main/java/traindb/sql/TrainDBSqlImportSynopsis.java

@@ -16,12 +16,14 @@
 
 class TrainDBSqlImportSynopsis extends TrainDBSqlCommand {
  private final String synopsisName;
+ private final SynopsisType synopsisType;
  private final String synopsisBinaryString;
  private final String importFilename;
 
- TrainDBSqlImportSynopsis(String synopsisName, String synopsisBinaryString,
- String importFilename) {
+ TrainDBSqlImportSynopsis(String synopsisName, SynopsisType synopsisType,
+ String synopsisBinaryString, String importFilename) {
  this.synopsisName = synopsisName;
+ this.synopsisType = synopsisType;
  this.synopsisBinaryString = synopsisBinaryString;
  this.importFilename = importFilename;
  }
@@ -30,6 +32,10 @@ String getSynopsisName() {
  return synopsisName;
  }
 
+ SynopsisType getSynopsisType() {
+ return synopsisType;
+ }
+
  String getSynopsisBinaryString() {
  return synopsisBinaryString;
  }

traindb-core/src/main/java/traindb/sql/TrainDBSqlRunner.java

@@ -82,8 +82,9 @@ void createSynopsis(String synopsisName, TrainDBSqlCommand.SynopsisType synopsis
 
  TrainDBListResultSet exportSynopsis(String synopsisName, String exportFilename) throws Exception;
 
- TrainDBListResultSet importSynopsis(String synopsisName, String synopsisBinaryString,
- String importFilename) throws Exception;
+ TrainDBListResultSet importSynopsis(String synopsisName,
+ TrainDBSqlCommand.SynopsisType synopsisType, String synopsisBinaryString,
+ String importFilename) throws Exception;
 
  void renameSynopsis(String synopsisName, String newSynopsisName) throws Exception;