[FLINK-12814][sql-client] Support a traditional and scrolling view of…

… result (tableau format) This closes apache#11273
static-max · Mar 3, 2020 · 242efcd · 242efcd
1 parent 3e10f0a
commit 242efcd
Show file tree

Hide file tree

Showing 9 changed files with 840 additions and 22 deletions.
diff --git a/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliClient.java b/flink-table/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliClient.java
@@ -512,21 +512,35 @@ private void callSelect(SqlCommandCall cmdCall) {
  printExecutionException(e);
  return;
  }
- final CliResultView view;
- if (resultDesc.isMaterialized()) {
- view = new CliTableResultView(this, resultDesc);
+
+ if (resultDesc.isTableauMode()) {
+ try (CliTableauResultView tableauResultView = new CliTableauResultView(
+ terminal, executor, sessionId, resultDesc)) {
+ if (resultDesc.isMaterialized()) {
+ tableauResultView.displayBatchResults();
+ } else {
+ tableauResultView.displayStreamResults();
+ }
+ } catch (SqlExecutionException e) {
+ printExecutionException(e);
+ }
  } else {
- view = new CliChangelogResultView(this, resultDesc);
- }
+ final CliResultView view;
+ if (resultDesc.isMaterialized()) {
+ view = new CliTableResultView(this, resultDesc);
+ } else {
+ view = new CliChangelogResultView(this, resultDesc);
+ }
 
- // enter view
- try {
- view.open();
+  // enter view
+  try {
+  view.open();
 
- // view left
- printInfo(CliStrings.MESSAGE_RESULT_QUIT);
- } catch (SqlExecutionException e) {
- printExecutionException(e);
+ // view left
+ printInfo(CliStrings.MESSAGE_RESULT_QUIT);
+ } catch (SqlExecutionException e) {
+ printExecutionException(e);
+ }
  }
  }