Skip to content

Commit dbfdca0

Browse files
authored
Merge 442b927 into 3e82d95
2 parents 3e82d95 + 442b927 commit dbfdca0

File tree

6 files changed

+30
-3
lines changed

6 files changed

+30
-3
lines changed

ydb/library/yql/sql/v1/SQLv1.g.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ object_features: object_feature | LPAREN object_feature (COMMA object_feature)*
623623

624624
object_type_ref: an_id_or_type;
625625

626-
create_table_stmt: CREATE (OR REPLACE)? (TABLE | TABLESTORE | EXTERNAL TABLE) (IF NOT EXISTS)? simple_table_ref LPAREN create_table_entry (COMMA create_table_entry)* COMMA? RPAREN
626+
create_table_stmt: CREATE (OR REPLACE)? (TABLE | TABLESTORE | EXTERNAL TABLE | TEMP TABLE) (IF NOT EXISTS)? simple_table_ref LPAREN create_table_entry (COMMA create_table_entry)* COMMA? RPAREN
627627
table_inherits?
628628
table_partition_by?
629629
with_table_settings?

ydb/library/yql/sql/v1/format/sql_format_ut.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,8 @@ Y_UNIT_TEST_SUITE(CheckSqlFormatter) {
307307
")\n"
308308
"PARTITION BY HASH (a, b, hash)\n"
309309
"WITH (tiering = 'some');\n"},
310-
{"create table if not exists user(user int32)", "CREATE TABLE IF NOT EXISTS user (\n\tuser int32\n);\n"}
310+
{"create table if not exists user(user int32)", "CREATE TABLE IF NOT EXISTS user (\n\tuser int32\n);\n"},
311+
{"create temp table user(user int32)", "CREATE TEMP TABLE user (\n\tuser int32\n);\n"}
311312
};
312313

313314
TSetup setup;

ydb/library/yql/sql/v1/node.h

+1
Original file line numberDiff line numberDiff line change
@@ -1046,6 +1046,7 @@ namespace NSQLTranslationV1 {
10461046
TVector<TChangefeedDescription> Changefeeds;
10471047
TTableSettings TableSettings;
10481048
ETableType TableType = ETableType::Table;
1049+
bool Temporary = false;
10491050
};
10501051

10511052
struct TAlterTableParameters {

ydb/library/yql/sql/v1/query.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -1140,6 +1140,10 @@ class TCreateTableNode final: public TAstListNode {
11401140
break;
11411141
}
11421142

1143+
if (Params.Temporary) {
1144+
opts = L(opts, Q(Y(Q("temporary"))));
1145+
}
1146+
11431147
Add("block", Q(Y(
11441148
Y("let", "sink", Y("DataSink", BuildQuotedAtom(Pos, Table.Service), Scoped->WrapCluster(Table.Cluster, ctx))),
11451149
Y("let", "world", Y(TString(WriteName), "world", "sink", keys, Y("Void"), Q(opts))),

ydb/library/yql/sql/v1/sql_query.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,14 @@ bool TSqlQuery::Statement(TVector<TNodePtr>& blocks, const TRule_sql_stmt_core&
166166

167167
const auto& block = rule.GetBlock3();
168168
ETableType tableType = ETableType::Table;
169+
bool temporary = false;
169170
if (block.HasAlt2() && block.GetAlt2().GetToken1().GetId() == SQLv1LexerTokens::TOKEN_TABLESTORE) {
170171
tableType = ETableType::TableStore;
171172
} else if (block.HasAlt3() && block.GetAlt3().GetToken1().GetId() == SQLv1LexerTokens::TOKEN_EXTERNAL) {
172173
tableType = ETableType::ExternalTable;
174+
} else if (block.HasAlt4() && block.GetAlt4().GetToken1().GetId() == SQLv1LexerTokens::TOKEN_TEMP) {
175+
temporary = true;
176+
Y_DEBUG_ABORT_UNLESS(block.GetAlt4().GetToken2().GetId() == SQLv1LexerTokens::TOKEN_TABLE);
173177
}
174178

175179
bool existingOk = false;
@@ -193,7 +197,7 @@ bool TSqlQuery::Statement(TVector<TNodePtr>& blocks, const TRule_sql_stmt_core&
193197
return false;
194198
}
195199

196-
TCreateTableParameters params{.TableType=tableType};
200+
TCreateTableParameters params{.TableType=tableType, .Temporary=temporary};
197201
if (!CreateTableEntry(rule.GetRule_create_table_entry7(), params)) {
198202
return false;
199203
}

ydb/library/yql/sql/v1/sql_ut.cpp

+17
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,23 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) {
10071007
UNIT_ASSERT_VALUES_EQUAL(1, elementStat["Write!"]);
10081008
}
10091009

1010+
Y_UNIT_TEST(CreateTempTable) {
1011+
NYql::TAstParseResult res = SqlToYql("USE plato; CREATE TEMP TABLE t (a int32, primary key(a));");
1012+
UNIT_ASSERT(res.Root);
1013+
1014+
TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) {
1015+
if (word == "Write!") {
1016+
UNIT_ASSERT_VALUES_UNEQUAL_C(TString::npos,
1017+
line.find(R"__((Write! world sink (Key '('tablescheme (String '"t"))) (Void) '('('mode 'create) '('columns '('('"a" (AsOptionalType (DataType 'Int32)) '('columnConstrains '()) '()))) '('primarykey '('"a")) '('temporary))))__"), line);
1018+
}
1019+
};
1020+
1021+
TWordCountHive elementStat = {{TString("Write!"), 0}};
1022+
VerifyProgram(res, elementStat, verifyLine);
1023+
1024+
UNIT_ASSERT_VALUES_EQUAL(1, elementStat["Write!"]);
1025+
}
1026+
10101027
Y_UNIT_TEST(CreateTableDuplicatedPkColumnsFail) {
10111028
NYql::TAstParseResult res = SqlToYql("USE plato; CREATE TABLE t (a int32 not null, primary key(a, a));");
10121029
UNIT_ASSERT(!res.Root);

0 commit comments

Comments
 (0)