From 695003b466831b6171419bd944dff63d46745fae Mon Sep 17 00:00:00 2001 From: qiuyesuifeng Date: Mon, 7 Sep 2015 08:48:50 -0400 Subject: [PATCH 1/5] util, plan, plan/plans, rset, rsets: fix-copyright-infringement. --- plan/plan.go | 4 ++++ plan/plans/distinct.go | 4 ++++ plan/plans/explain.go | 4 ++++ plan/plans/fields.go | 4 ++++ plan/plans/from.go | 4 ++++ plan/plans/groupby.go | 4 ++++ plan/plans/join.go | 4 ++++ plan/plans/limit.go | 4 ++++ plan/plans/orderby.go | 4 ++++ plan/plans/plans.go | 4 ++++ plan/plans/where.go | 4 ++++ rset/rset.go | 4 ++++ rset/rsets/distinct.go | 4 ++++ rset/rsets/fields.go | 4 ++++ rset/rsets/from.go | 4 ++++ rset/rsets/groupby.go | 4 ++++ rset/rsets/join.go | 4 ++++ rset/rsets/limit.go | 4 ++++ rset/rsets/orderby.go | 4 ++++ rset/rsets/rsets.go | 4 ++++ rset/rsets/where.go | 4 ++++ util/format/format.go | 4 ++++ util/prefix_helper.go | 4 ++++ util/types/compare.go | 4 ++++ util/types/convert.go | 4 ++++ util/types/etc.go | 4 ++++ util/types/field_type.go | 4 ++++ 27 files changed, 108 insertions(+) diff --git a/plan/plan.go b/plan/plan.go index 3c8ca5bbab950..4602c3dadb716 100644 --- a/plan/plan.go +++ b/plan/plan.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/plan/plans/distinct.go b/plan/plans/distinct.go index 13d0ed29e9fad..59a892fc83ccb 100644 --- a/plan/plans/distinct.go +++ b/plan/plans/distinct.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/plan/plans/explain.go b/plan/plans/explain.go index 4221c7f057821..6a0f0231db49c 100644 --- a/plan/plans/explain.go +++ b/plan/plans/explain.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/plan/plans/fields.go b/plan/plans/fields.go index f16382ddbabe7..17e5641b3ed17 100644 --- a/plan/plans/fields.go +++ b/plan/plans/fields.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/plan/plans/from.go b/plan/plans/from.go index c777b615fd8cc..bdee50570a546 100644 --- a/plan/plans/from.go +++ b/plan/plans/from.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/plan/plans/groupby.go b/plan/plans/groupby.go index 03d0da3775bc5..b6356e0654c7d 100644 --- a/plan/plans/groupby.go +++ b/plan/plans/groupby.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/plan/plans/join.go b/plan/plans/join.go index 6d12f199d782e..66fee44463e5b 100644 --- a/plan/plans/join.go +++ b/plan/plans/join.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/plan/plans/limit.go b/plan/plans/limit.go index a10c88d78571a..834587490ac16 100644 --- a/plan/plans/limit.go +++ b/plan/plans/limit.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/plan/plans/orderby.go b/plan/plans/orderby.go index 5961f797cfd29..5c2ef64782a23 100644 --- a/plan/plans/orderby.go +++ b/plan/plans/orderby.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/plan/plans/plans.go b/plan/plans/plans.go index 1f658980c8219..ab1ace147d171 100644 --- a/plan/plans/plans.go +++ b/plan/plans/plans.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/plan/plans/where.go b/plan/plans/where.go index 76467cb7cfbbb..1ba2cad4c21f0 100644 --- a/plan/plans/where.go +++ b/plan/plans/where.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/rset/rset.go b/rset/rset.go index 554719b4284f8..1f10b7cbc5509 100644 --- a/rset/rset.go +++ b/rset/rset.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/rset/rsets/distinct.go b/rset/rsets/distinct.go index 65295349cd9d4..51e1b37684cc5 100644 --- a/rset/rsets/distinct.go +++ b/rset/rsets/distinct.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/rset/rsets/fields.go b/rset/rsets/fields.go index 5419304357ab4..76dcc53714ff8 100644 --- a/rset/rsets/fields.go +++ b/rset/rsets/fields.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/rset/rsets/from.go b/rset/rsets/from.go index 2ef60b8c8d822..7305e68b3afdf 100644 --- a/rset/rsets/from.go +++ b/rset/rsets/from.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/rset/rsets/groupby.go b/rset/rsets/groupby.go index c9b6514b017b7..2bc17d8942881 100644 --- a/rset/rsets/groupby.go +++ b/rset/rsets/groupby.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/rset/rsets/join.go b/rset/rsets/join.go index 15cbcb9bb335a..d342d3b9907af 100644 --- a/rset/rsets/join.go +++ b/rset/rsets/join.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/rset/rsets/limit.go b/rset/rsets/limit.go index 86c24529d731d..2de34b3e71636 100644 --- a/rset/rsets/limit.go +++ b/rset/rsets/limit.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/rset/rsets/orderby.go b/rset/rsets/orderby.go index c5e1f7cdadbe7..12c97c0b5dcbf 100644 --- a/rset/rsets/orderby.go +++ b/rset/rsets/orderby.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/rset/rsets/rsets.go b/rset/rsets/rsets.go index 6d5124f7c185b..74068ee09b4a6 100644 --- a/rset/rsets/rsets.go +++ b/rset/rsets/rsets.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/rset/rsets/where.go b/rset/rsets/where.go index 52d0c1a1ae587..68381a5c37838 100644 --- a/rset/rsets/where.go +++ b/rset/rsets/where.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/util/format/format.go b/util/format/format.go index a177def21351e..67dd23bba6b3f 100644 --- a/util/format/format.go +++ b/util/format/format.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/util/prefix_helper.go b/util/prefix_helper.go index 471ca4a70bcb8..110eb0ff386db 100644 --- a/util/prefix_helper.go +++ b/util/prefix_helper.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/util/types/compare.go b/util/types/compare.go index adc0d95703228..5b9d898e7d052 100644 --- a/util/types/compare.go +++ b/util/types/compare.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/util/types/convert.go b/util/types/convert.go index 3fdcaa922ba66..ef515398ca7ee 100644 --- a/util/types/convert.go +++ b/util/types/convert.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/util/types/etc.go b/util/types/etc.go index 53c071ee510a2..2375eb7915d13 100644 --- a/util/types/etc.go +++ b/util/types/etc.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/util/types/field_type.go b/util/types/field_type.go index 4d9f6eee8be54..db99bf944a8f5 100644 --- a/util/types/field_type.go +++ b/util/types/field_type.go @@ -1,3 +1,7 @@ +// Copyright 2014 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); From 47f067c0810d748d102baa7afca8ef01b77b9f2c Mon Sep 17 00:00:00 2001 From: qiuyesuifeng Date: Mon, 7 Sep 2015 08:53:02 -0400 Subject: [PATCH 2/5] mydeldef: fix-copyright-infringement. --- mysqldef/decimal.go | 46 ++++++++++++++++++++++++++++++++++++++++ mysqldef/decimal_test.go | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/mysqldef/decimal.go b/mysqldef/decimal.go index a713079010da1..535465a80f3c9 100644 --- a/mysqldef/decimal.go +++ b/mysqldef/decimal.go @@ -1,3 +1,49 @@ +// The MIT License (MIT) + +// Copyright (c) 2015 Spring, Inc. + +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: + +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. + +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +// - Based on https://github.com/oguzbilgic/fpd, which has the following license: +// """ +// The MIT License (MIT) + +// Copyright (c) 2013 Oguz Bilgic + +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: + +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. + +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// """ + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/mysqldef/decimal_test.go b/mysqldef/decimal_test.go index c38ab8ce3ad64..232beb9d801d2 100644 --- a/mysqldef/decimal_test.go +++ b/mysqldef/decimal_test.go @@ -1,3 +1,49 @@ +// The MIT License (MIT) + +// Copyright (c) 2015 Spring, Inc. + +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: + +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. + +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. + +// - Based on https://github.com/oguzbilgic/fpd, which has the following license: +// """ +// The MIT License (MIT) + +// Copyright (c) 2013 Oguz Bilgic + +// Permission is hereby granted, free of charge, to any person obtaining a copy of +// this software and associated documentation files (the "Software"), to deal in +// the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: + +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. + +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// """ + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); From a2e688a32d4e6bb7202a2ea34518c0e661bacf04 Mon Sep 17 00:00:00 2001 From: siddontang Date: Mon, 7 Sep 2015 20:53:11 +0800 Subject: [PATCH 3/5] util: add cockroach license --- util/codec/bytes.go | 17 +++++++++++++++++ util/codec/number.go | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/util/codec/bytes.go b/util/codec/bytes.go index 56be57ab11c59..11c8bdf12e3a7 100644 --- a/util/codec/bytes.go +++ b/util/codec/bytes.go @@ -1,3 +1,20 @@ +// Copyright 2014 The Cockroach Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +// implied. See the License for the specific language governing +// permissions and limitations under the License. See the AUTHORS file +// for names of contributors. +// +// Author: Tobias Schottdorf (tobias.schottdorf@gmail.com) + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/util/codec/number.go b/util/codec/number.go index 9bab5b2a9a94a..615b66be07736 100644 --- a/util/codec/number.go +++ b/util/codec/number.go @@ -1,3 +1,20 @@ +// Copyright 2014 The Cockroach Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +// implied. See the License for the specific language governing +// permissions and limitations under the License. See the AUTHORS file +// for names of contributors. +// +// Author: Tobias Schottdorf (tobias.schottdorf@gmail.com) + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); From b2d62f9fb68bc4a65be50f2582cd83c70884b3ec Mon Sep 17 00:00:00 2001 From: qiuyesuifeng Date: Mon, 7 Sep 2015 09:05:15 -0400 Subject: [PATCH 4/5] mysqldef, kv, stmt, stmt/stmts, parser, field: fix-copyright-infringement. --- expression/expression.go | 4 ++++ expression/expressions/between.go | 4 ++++ expression/expressions/binop.go | 4 ++++ expression/expressions/builtin.go | 4 ++++ expression/expressions/builtin_groupby.go | 4 ++++ expression/expressions/builtin_math.go | 4 ++++ expression/expressions/builtin_string.go | 4 ++++ expression/expressions/builtin_time.go | 4 ++++ expression/expressions/call.go | 4 ++++ expression/expressions/helper.go | 4 ++++ expression/expressions/ident.go | 4 ++++ expression/expressions/in.go | 4 ++++ expression/expressions/like.go | 4 ++++ expression/expressions/pexpr.go | 4 ++++ expression/expressions/regexp.go | 4 ++++ expression/expressions/unary.go | 4 ++++ expression/expressions/value.go | 4 ++++ field/field.go | 4 ++++ field/result_field.go | 4 ++++ kv/memkv/btree.go | 4 ++++ kv/memkv/temp.go | 4 ++++ parser/parser.y | 17 +++++++++++++++++ parser/scanner.l | 16 ++++++++++++++++ stmt/stmt.go | 4 ++++ stmt/stmts/altertable.go | 4 ++++ stmt/stmts/create.go | 4 ++++ stmt/stmts/delete.go | 4 ++++ stmt/stmts/drop.go | 4 ++++ stmt/stmts/explain.go | 4 ++++ stmt/stmts/insert.go | 4 ++++ stmt/stmts/select.go | 4 ++++ stmt/stmts/transaction.go | 4 ++++ stmt/stmts/truncate.go | 4 ++++ stmt/stmts/update.go | 4 ++++ stmt/stmts/use.go | 4 ++++ 35 files changed, 165 insertions(+) diff --git a/expression/expression.go b/expression/expression.go index 84fb6117b9a58..c968f9584e7b2 100644 --- a/expression/expression.go +++ b/expression/expression.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/between.go b/expression/expressions/between.go index 10567a41028b5..f82ea851f066a 100644 --- a/expression/expressions/between.go +++ b/expression/expressions/between.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/binop.go b/expression/expressions/binop.go index 07f0e835706ef..5845d7b8354c8 100644 --- a/expression/expressions/binop.go +++ b/expression/expressions/binop.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/builtin.go b/expression/expressions/builtin.go index 27e7b785ea45f..18c79aebc758b 100644 --- a/expression/expressions/builtin.go +++ b/expression/expressions/builtin.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/builtin_groupby.go b/expression/expressions/builtin_groupby.go index c6b9ee0a8e2b3..c6d2d968199ec 100644 --- a/expression/expressions/builtin_groupby.go +++ b/expression/expressions/builtin_groupby.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/builtin_math.go b/expression/expressions/builtin_math.go index 7479a3f798d29..f3ad79f468cdb 100644 --- a/expression/expressions/builtin_math.go +++ b/expression/expressions/builtin_math.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/builtin_string.go b/expression/expressions/builtin_string.go index 1e17b5237744b..6b6c97c63d7bf 100644 --- a/expression/expressions/builtin_string.go +++ b/expression/expressions/builtin_string.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/builtin_time.go b/expression/expressions/builtin_time.go index d815f08fab21f..99b50401a6f9a 100644 --- a/expression/expressions/builtin_time.go +++ b/expression/expressions/builtin_time.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/call.go b/expression/expressions/call.go index 53a6f02b336a9..7c3b8a51624b0 100644 --- a/expression/expressions/call.go +++ b/expression/expressions/call.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/helper.go b/expression/expressions/helper.go index 5b55c124fbb71..8ac583cd455a9 100644 --- a/expression/expressions/helper.go +++ b/expression/expressions/helper.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/ident.go b/expression/expressions/ident.go index 0876155645874..a8a7bb2d50562 100644 --- a/expression/expressions/ident.go +++ b/expression/expressions/ident.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/in.go b/expression/expressions/in.go index 0c1b784301ab0..599131c4754a1 100644 --- a/expression/expressions/in.go +++ b/expression/expressions/in.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/like.go b/expression/expressions/like.go index 40a5df3d3d6ed..cbabdcb8a060c 100644 --- a/expression/expressions/like.go +++ b/expression/expressions/like.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/pexpr.go b/expression/expressions/pexpr.go index 6956e00c80cc9..2c1ca9b4fbe56 100644 --- a/expression/expressions/pexpr.go +++ b/expression/expressions/pexpr.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/regexp.go b/expression/expressions/regexp.go index b7a1c9d3b7054..0b65005cd1f9b 100644 --- a/expression/expressions/regexp.go +++ b/expression/expressions/regexp.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/unary.go b/expression/expressions/unary.go index 538132618e729..c6263dc5b58d9 100644 --- a/expression/expressions/unary.go +++ b/expression/expressions/unary.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/expression/expressions/value.go b/expression/expressions/value.go index f881ac8fcd8eb..683018dd49a15 100644 --- a/expression/expressions/value.go +++ b/expression/expressions/value.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/field/field.go b/field/field.go index 6ea56efea7aba..302448968e0d5 100644 --- a/field/field.go +++ b/field/field.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/field/result_field.go b/field/result_field.go index ba586b4edea7a..d8a9958454c59 100644 --- a/field/result_field.go +++ b/field/result_field.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/kv/memkv/btree.go b/kv/memkv/btree.go index cd6dee4e77864..91e8a8f1522e8 100644 --- a/kv/memkv/btree.go +++ b/kv/memkv/btree.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/kv/memkv/temp.go b/kv/memkv/temp.go index a4cbbbd7ce4ef..397ba67cc0229 100644 --- a/kv/memkv/temp.go +++ b/kv/memkv/temp.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/parser/parser.y b/parser/parser.y index 3d437bb8aae5e..55a58d5ba1bfb 100644 --- a/parser/parser.y +++ b/parser/parser.y @@ -1,4 +1,21 @@ %{ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Copyright 2015 PingCAP, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// See the License for the specific language governing permissions and +// limitations under the License. + // Inital yacc source generated by ebnf2y[1] // at 2013-10-04 23:10:47.861401015 +0200 CEST // diff --git a/parser/scanner.l b/parser/scanner.l index 1bf4a4c8fa574..1d54f524b6aec 100644 --- a/parser/scanner.l +++ b/parser/scanner.l @@ -1,4 +1,20 @@ %{ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Copyright 2015 PingCAP, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// See the License for the specific language governing permissions and +// limitations under the License. package parser diff --git a/stmt/stmt.go b/stmt/stmt.go index e2108878a7985..5d3747f60c298 100644 --- a/stmt/stmt.go +++ b/stmt/stmt.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/stmt/stmts/altertable.go b/stmt/stmts/altertable.go index 5fb607110b84b..c9af204cfb496 100644 --- a/stmt/stmts/altertable.go +++ b/stmt/stmts/altertable.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/stmt/stmts/create.go b/stmt/stmts/create.go index 71d94cd23abcb..cd0c3855f845f 100644 --- a/stmt/stmts/create.go +++ b/stmt/stmts/create.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/stmt/stmts/delete.go b/stmt/stmts/delete.go index 0cdab1f61b7a8..8fbbc802e0b62 100644 --- a/stmt/stmts/delete.go +++ b/stmt/stmts/delete.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/stmt/stmts/drop.go b/stmt/stmts/drop.go index 6f88c0cc4bd8d..ed916286447ad 100644 --- a/stmt/stmts/drop.go +++ b/stmt/stmts/drop.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/stmt/stmts/explain.go b/stmt/stmts/explain.go index f843229c3c1e3..de7a4e007ada0 100644 --- a/stmt/stmts/explain.go +++ b/stmt/stmts/explain.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/stmt/stmts/insert.go b/stmt/stmts/insert.go index e9056cc559033..5999856f3c1fb 100644 --- a/stmt/stmts/insert.go +++ b/stmt/stmts/insert.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/stmt/stmts/select.go b/stmt/stmts/select.go index 5dcb30cb99219..1354e80a720f2 100644 --- a/stmt/stmts/select.go +++ b/stmt/stmts/select.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/stmt/stmts/transaction.go b/stmt/stmts/transaction.go index 2b185f1b6d5da..36be518fd526b 100644 --- a/stmt/stmts/transaction.go +++ b/stmt/stmts/transaction.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/stmt/stmts/truncate.go b/stmt/stmts/truncate.go index 9df2b1dba4605..0a8a7f51709d4 100644 --- a/stmt/stmts/truncate.go +++ b/stmt/stmts/truncate.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/stmt/stmts/update.go b/stmt/stmts/update.go index 249d9805c555b..9105444af9867 100644 --- a/stmt/stmts/update.go +++ b/stmt/stmts/update.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/stmt/stmts/use.go b/stmt/stmts/use.go index 82d7e1cb6e2d0..c35b38d14f9dc 100644 --- a/stmt/stmts/use.go +++ b/stmt/stmts/use.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); From 4ca7ca7e5bc4b1a17f6a7a5d643f8ecacc3a3844 Mon Sep 17 00:00:00 2001 From: qiuyesuifeng Date: Mon, 7 Sep 2015 09:15:16 -0400 Subject: [PATCH 5/5] tidb, column, table, table/tables: fix-copyright-infringement. --- column/column.go | 4 ++++ ddl/ddl.go | 4 ++++ driver.go | 4 ++++ session.go | 4 ++++ table/table.go | 4 ++++ table/tables/tables.go | 4 ++++ tidb.go | 4 ++++ 7 files changed, 28 insertions(+) diff --git a/column/column.go b/column/column.go index b43531e036634..97a996f7d55ce 100644 --- a/column/column.go +++ b/column/column.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/ddl/ddl.go b/ddl/ddl.go index 285b8e9187b60..ed10f45d0d664 100644 --- a/ddl/ddl.go +++ b/ddl/ddl.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/driver.go b/driver.go index 2a325764b9ee4..c69618736b86b 100644 --- a/driver.go +++ b/driver.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/session.go b/session.go index 40d3e22adcd14..eb4d88381e4ab 100644 --- a/session.go +++ b/session.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/table/table.go b/table/table.go index 9c48963071c0f..8aa41eca81246 100644 --- a/table/table.go +++ b/table/table.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/table/tables/tables.go b/table/tables/tables.go index e8a3fc10df860..581e97b06e3ff 100644 --- a/table/tables/tables.go +++ b/table/tables/tables.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tidb.go b/tidb.go index fea0c5e67f966..cb8335f32ac3e 100644 --- a/tidb.go +++ b/tidb.go @@ -1,3 +1,7 @@ +// Copyright 2013 The ql Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + // Copyright 2015 PingCAP, Inc. // // Licensed under the Apache License, Version 2.0 (the "License");