Skip to content

Commit 2b3f27b

Browse files
ilianailiana
committed
a few more fixes
1 parent d5dc1f9 commit 2b3f27b

File tree

3 files changed

+51
-51
lines changed

3 files changed

+51
-51
lines changed

‎pkg/sql/opt/exec/execbuilder/testdata/hash_sharded_index

+1-1
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ vectorized: true
549549
columns: (i2, i4, i8, f4, f8, s, c, b, dc, ival, oid, tstz, ts, da, inet, vb)
550550
estimated row count: 1 (missing stats)
551551
table: sharded_primary_with_many_column_types@sharded_primary_with_many_column_types_pkey
552-
spans: /3/1/1/1/1/1/"1"/"1"/"1"/1/00:00:01/1/1970-01-01T00:00:01Z/1970-01-01T00:00:01Z/1/"\x00 \u007f\x00\x00\x01"/B/0
552+
spans: /3/1/1/1/1/1/"1"/"1"/"1"/1/00:00:01/1/1970-01-01T00:00:01Z/1970-01-01T00:00:01Z/1/"\x00 \x7f\x00\x00\x01"/B/0
553553

554554
# Test to make sure constraint on shard column value is added correctly when
555555
# creating a table with output show create table.

‎pkg/sql/opt/optgen/cmd/optgen/testdata/factory

+48-48
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,14 @@ func (_f *Factory) ConstructKVOptionsItem(
200200
// ancestors via a call to the corresponding factory Construct methods. Here
201201
// is example usage:
202202
//
203-
// var replace func(e opt.Expr) opt.Expr
204-
// replace = func(e opt.Expr) opt.Expr {
205-
// if e.Op() == opt.VariableOp {
206-
// return getReplaceVar(e)
207-
// }
208-
// return factory.Replace(e, replace)
209-
// }
210-
// replace(root, replace)
203+
// var replace func(e opt.Expr) opt.Expr
204+
// replace = func(e opt.Expr) opt.Expr {
205+
// if e.Op() == opt.VariableOp {
206+
// return getReplaceVar(e)
207+
// }
208+
// return factory.Replace(e, replace)
209+
// }
210+
// replace(root, replace)
211211
//
212212
// Here, all variables in the tree are being replaced by some other expression
213213
// in a pre-order traversal of the tree. Post-order traversal is trivially
@@ -547,14 +547,14 @@ SKIP_RULES:
547547
// ancestors via a call to the corresponding factory Construct methods. Here
548548
// is example usage:
549549
//
550-
// var replace func(e opt.Expr) opt.Expr
551-
// replace = func(e opt.Expr) opt.Expr {
552-
// if e.Op() == opt.VariableOp {
553-
// return getReplaceVar(e)
554-
// }
555-
// return factory.Replace(e, replace)
556-
// }
557-
// replace(root, replace)
550+
// var replace func(e opt.Expr) opt.Expr
551+
// replace = func(e opt.Expr) opt.Expr {
552+
// if e.Op() == opt.VariableOp {
553+
// return getReplaceVar(e)
554+
// }
555+
// return factory.Replace(e, replace)
556+
// }
557+
// replace(root, replace)
558558
//
559559
// Here, all variables in the tree are being replaced by some other expression
560560
// in a pre-order traversal of the tree. Post-order traversal is trivially
@@ -704,14 +704,14 @@ SKIP_RULES:
704704
// ancestors via a call to the corresponding factory Construct methods. Here
705705
// is example usage:
706706
//
707-
// var replace func(e opt.Expr) opt.Expr
708-
// replace = func(e opt.Expr) opt.Expr {
709-
// if e.Op() == opt.VariableOp {
710-
// return getReplaceVar(e)
711-
// }
712-
// return factory.Replace(e, replace)
713-
// }
714-
// replace(root, replace)
707+
// var replace func(e opt.Expr) opt.Expr
708+
// replace = func(e opt.Expr) opt.Expr {
709+
// if e.Op() == opt.VariableOp {
710+
// return getReplaceVar(e)
711+
// }
712+
// return factory.Replace(e, replace)
713+
// }
714+
// replace(root, replace)
715715
//
716716
// Here, all variables in the tree are being replaced by some other expression
717717
// in a pre-order traversal of the tree. Post-order traversal is trivially
@@ -898,14 +898,14 @@ SKIP_RULES:
898898
// ancestors via a call to the corresponding factory Construct methods. Here
899899
// is example usage:
900900
//
901-
// var replace func(e opt.Expr) opt.Expr
902-
// replace = func(e opt.Expr) opt.Expr {
903-
// if e.Op() == opt.VariableOp {
904-
// return getReplaceVar(e)
905-
// }
906-
// return factory.Replace(e, replace)
907-
// }
908-
// replace(root, replace)
901+
// var replace func(e opt.Expr) opt.Expr
902+
// replace = func(e opt.Expr) opt.Expr {
903+
// if e.Op() == opt.VariableOp {
904+
// return getReplaceVar(e)
905+
// }
906+
// return factory.Replace(e, replace)
907+
// }
908+
// replace(root, replace)
909909
//
910910
// Here, all variables in the tree are being replaced by some other expression
911911
// in a pre-order traversal of the tree. Post-order traversal is trivially
@@ -1158,14 +1158,14 @@ SKIP_RULES:
11581158
// ancestors via a call to the corresponding factory Construct methods. Here
11591159
// is example usage:
11601160
//
1161-
// var replace func(e opt.Expr) opt.Expr
1162-
// replace = func(e opt.Expr) opt.Expr {
1163-
// if e.Op() == opt.VariableOp {
1164-
// return getReplaceVar(e)
1165-
// }
1166-
// return factory.Replace(e, replace)
1167-
// }
1168-
// replace(root, replace)
1161+
// var replace func(e opt.Expr) opt.Expr
1162+
// replace = func(e opt.Expr) opt.Expr {
1163+
// if e.Op() == opt.VariableOp {
1164+
// return getReplaceVar(e)
1165+
// }
1166+
// return factory.Replace(e, replace)
1167+
// }
1168+
// replace(root, replace)
11691169
//
11701170
// Here, all variables in the tree are being replaced by some other expression
11711171
// in a pre-order traversal of the tree. Post-order traversal is trivially
@@ -1478,14 +1478,14 @@ SKIP_RULES:
14781478
// ancestors via a call to the corresponding factory Construct methods. Here
14791479
// is example usage:
14801480
//
1481-
// var replace func(e opt.Expr) opt.Expr
1482-
// replace = func(e opt.Expr) opt.Expr {
1483-
// if e.Op() == opt.VariableOp {
1484-
// return getReplaceVar(e)
1485-
// }
1486-
// return factory.Replace(e, replace)
1487-
// }
1488-
// replace(root, replace)
1481+
// var replace func(e opt.Expr) opt.Expr
1482+
// replace = func(e opt.Expr) opt.Expr {
1483+
// if e.Op() == opt.VariableOp {
1484+
// return getReplaceVar(e)
1485+
// }
1486+
// return factory.Replace(e, replace)
1487+
// }
1488+
// replace(root, replace)
14891489
//
14901490
// Here, all variables in the tree are being replaced by some other expression
14911491
// in a pre-order traversal of the tree. Post-order traversal is trivially

‎pkg/util/log/test_log_scope.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -395,9 +395,9 @@ func (l *TestLogScope) Close(t tShim) {
395395
// If the test failed or there was a panic, we keep the log
396396
// files for further investigation.
397397
if inPanic {
398-
fmt.Fprintln(OrigStderr, "\nERROR: a panic has occurred!\n"+
398+
fmt.Fprint(OrigStderr, "\nERROR: a panic has occurred!\n"+
399399
"Details cannot be printed yet because we are still unwinding.\n"+
400-
"Hopefully the test harness prints the panic below, otherwise check the test logs.\n")
400+
"Hopefully the test harness prints the panic below, otherwise check the test logs.\n\n")
401401
}
402402
fmt.Fprintln(OrigStderr, "test logs left over in:", l.logDir)
403403
} else {

0 commit comments

Comments
 (0)