Skip to content

Commit 0fdb746

Browse files
committed
Fix comments
1 parent a836893 commit 0fdb746

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

parser/src/java/org/apache/hadoop/hive/ql/parse/CreateDDLParser.g

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ dcProperties
152152
@init { gParent.pushMsg("dcproperties", state); }
153153
@after { gParent.popMsg(state); }
154154
:
155-
LPAREN dbPropertiesList RPAREN -> ^(TOK_DATACONNECTORPROPERTIES dbPropertiesList)
155+
LPAREN propertiesList RPAREN -> ^(TOK_DATACONNECTORPROPERTIES propertiesList)
156156
;
157157

158158
dropDataConnectorStatement

parser/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ TOK_DESCDATABASE;
384384
TOK_DATABASEPROPERTIES;
385385
TOK_DATABASELOCATION;
386386
TOK_DATABASE_MANAGEDLOCATION;
387-
TOK_DBPROPLIST;
387+
TOK_PROPLIST;
388388
TOK_ALTERDATABASE_PROPERTIES;
389389
TOK_ALTERDATABASE_OWNER;
390390
TOK_ALTERDATABASE_LOCATION;
@@ -1151,7 +1151,7 @@ catProperties
11511151
@init { pushMsg("catproperties", state); }
11521152
@after { popMsg(state); }
11531153
:
1154-
LPAREN dbPropertiesList RPAREN -> ^(TOK_CATALOGPROPERTIES dbPropertiesList)
1154+
LPAREN propertiesList RPAREN -> ^(TOK_CATALOGPROPERTIES propertiesList)
11551155
;
11561156
11571157
dropCatalogStatement
@@ -1200,14 +1200,14 @@ dbProperties
12001200
@init { pushMsg("dbproperties", state); }
12011201
@after { popMsg(state); }
12021202
:
1203-
LPAREN dbPropertiesList RPAREN -> ^(TOK_DATABASEPROPERTIES dbPropertiesList)
1203+
LPAREN propertiesList RPAREN -> ^(TOK_DATABASEPROPERTIES propertiesList)
12041204
;
12051205
1206-
dbPropertiesList
1207-
@init { pushMsg("database properties list", state); }
1206+
propertiesList
1207+
@init { pushMsg("properties list", state); }
12081208
@after { popMsg(state); }
12091209
:
1210-
keyValueProperty (COMMA keyValueProperty)* -> ^(TOK_DBPROPLIST keyValueProperty+)
1210+
keyValueProperty (COMMA keyValueProperty)* -> ^(TOK_PROPLIST keyValueProperty+)
12111211
;
12121212
12131213
dbConnectorName

parser/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -974,7 +974,7 @@ nonReserved
974974
KW_ABORT | KW_ADD | KW_ADMIN | KW_AFTER | KW_ANALYZE | KW_ARCHIVE | KW_ASC | KW_BEFORE | KW_BUCKET | KW_BUCKETS
975975
| KW_CASCADE | KW_CBO | KW_CHANGE | KW_CHECK | KW_CLUSTER | KW_CLUSTERED | KW_CLUSTERSTATUS | KW_COLLECTION | KW_COLUMNS
976976
| KW_COMMENT | KW_COMPACT | KW_COMPACTIONS | KW_COMPUTE | KW_CONCATENATE | KW_CONTINUE | KW_COST | KW_DATA | KW_DAY | KW_CATALOG | KW_CATALOGS
977-
| KW_DATABASES | KW_DATETIME | KW_DBPROPERTIES | KW_DCPROPERTIES |KW_PROPERTIES | KW_DEFERRED | KW_DEFINED | KW_DELIMITED | KW_DEPENDENCY
977+
| KW_DATABASES | KW_DATETIME | KW_DBPROPERTIES | KW_DCPROPERTIES | KW_PROPERTIES | KW_DEFERRED | KW_DEFINED | KW_DELIMITED | KW_DEPENDENCY
978978
| KW_DESC | KW_DIRECTORIES | KW_DIRECTORY | KW_DISABLE | KW_DISTRIBUTE | KW_DISTRIBUTED | KW_DOW | KW_ELEM_TYPE
979979
| KW_ENABLE | KW_ENFORCED | KW_ESCAPED | KW_EXCLUSIVE | KW_EXPLAIN | KW_EXPORT | KW_FIELDS | KW_FILE | KW_FILEFORMAT
980980
| KW_FIRST | KW_FORMAT | KW_FORMATTED | KW_FUNCTIONS | KW_HOUR | KW_IDXPROPERTIES | KW_RESPECT | KW_IGNORE

ql/src/java/org/apache/hadoop/hive/ql/ddl/catalog/create/CreateCatalogDesc.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ public class CreateCatalogDesc implements DDLDesc, Serializable {
3737
private final boolean ifNotExists;
3838
private final Map<String, String> catProperties;
3939

40-
public CreateCatalogDesc(String catalogName, String comment, String locationUri, boolean ifNotExists, Map<String, String> dcProperties) {
40+
public CreateCatalogDesc(String catalogName, String comment, String locationUri, boolean ifNotExists, Map<String, String> catProperties) {
4141
this.catalogName = catalogName;
4242
this.comment = comment;
4343
this.locationUri = locationUri;
4444
this.ifNotExists = ifNotExists;
45-
this.catProperties = dcProperties;
45+
this.catProperties = catProperties;
4646
}
4747

4848
@Explain(displayName="name", explainLevels = { Explain.Level.USER, Explain.Level.DEFAULT, Explain.Level.EXTENDED })

standalone-metastore/metastore-server/src/main/resources/package.jdo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<column name="PARAM_KEY" length="180" jdbc-type="VARCHAR"/>
111111
</key>
112112
<value>
113-
<column name="PARAM_VALUE" length="32672" jdbc-type="VARCHAR"/>
113+
<column name="PARAM_VALUE" length="4000" jdbc-type="VARCHAR"/>
114114
</value>
115115
</field>
116116
</class>
@@ -1620,7 +1620,7 @@
16201620
<column name="PARAM_KEY" length="180" jdbc-type="VARCHAR"/>
16211621
</key>
16221622
<value>
1623-
<column name="PARAM_VALUE" length="32672" jdbc-type="VARCHAR"/>
1623+
<column name="PARAM_VALUE" length="4000" jdbc-type="VARCHAR"/>
16241624
</value>
16251625
</field>
16261626
</class>

0 commit comments

Comments
 (0)