From a466d2668902de9cd8a35e7ff04ad110ae4d8d7a Mon Sep 17 00:00:00 2001 From: Sumedh Wale Date: Tue, 12 Apr 2022 05:59:26 +0530 Subject: [PATCH] Updates for 1.3.1 release - fixed UDF names lookups to do exact regex match in the CSV list in the meta-data region i.e. ",," or "," instead of just searching for ; this fixes failures in UserDefinedFunctionsDUnitTest when run in suite due to previous test having superset name "intudf_embed" which subsumed "intudf" causing the code to think that "intudf" was dropped in meta-data region - updated log4j2 to 2.17.2 - changed jetty version to 9.4.43.v20210629 - updated sub-modules versions - rollover the log-file on startup in the log4j2.properties.template - fixed custom logj42.properties getting overridden by log4j2-defaults.properties at start - fixed log file output shown on startup - changed standard output file "start_" to use suffix as actual configured log-file name - updated cluster-util.sh and other utilities to use log4j2.properties instead of log4j.properties - updated docs and remaining places for log4j2.properties instead of log4j.properties - updated dependency versions in LICENSE and NOTICE - fixed sporadic failures in JDBCPreparedStatementDUnitTest, SnappyStorageEvictorSuite - changed all instances of Process.exitValue() to instead use timed waitFor() because former is broken and may return values like "-1" before process exit --- LICENSE | 28 +-- NOTICE | 178 +++++++++--------- build.gradle | 8 +- cluster/bin/snappy | 2 +- cluster/conf/log4j2.properties.template | 2 + cluster/sbin/cluster-util.sh | 8 +- .../SnappyMetricsSystemDUnitTest.scala | 2 +- .../JDBCPreparedStatementDUnitTest.scala | 158 ++++++++-------- .../udf/UserDefinedFunctionsDUnitTest.scala | 6 + .../spark/executor/SnappyExecutor.scala | 11 +- .../org/apache/spark/util/SnappyUtils.scala | 2 +- .../memory/SnappyStorageEvictorSuite.scala | 2 + .../cluster/CassandraSnappyDUnitTest.scala | 11 +- .../io/snappydata/cluster/ClusterUtils.scala | 2 + .../SplitClusterDUnitSecurityTest.scala | 10 + .../org/apache/spark/SparkUtilsAccess.scala | 6 +- .../sql/catalog/impl/StoreHiveCatalog.scala | 3 +- .../{JarUtils.scala => ContextJarUtils.scala} | 88 +++++---- .../sql/internal/SnappySessionCatalog.scala | 8 +- .../configuring_cluster.md | 12 +- docs/howto/start_snappy_cluster.md | 2 +- docs/kubernetes.md | 4 +- .../main/scala/org/apache/spark/Logging.scala | 5 +- jdbc/build.gradle | 2 + .../io/snappydata/tools/QuickLauncher.java | 2 +- spark | 2 +- spark-jobserver | 2 +- store | 2 +- 28 files changed, 306 insertions(+), 262 deletions(-) rename core/src/main/scala/org/apache/spark/sql/internal/{JarUtils.scala => ContextJarUtils.scala} (65%) diff --git a/LICENSE b/LICENSE index 6abae0cb82..4097f754f1 100644 --- a/LICENSE +++ b/LICENSE @@ -37697,7 +37697,7 @@ provided this notice is preserved. -------------------------------------------------------------------------------- * -gemfire-core: 1.6.5 +gemfire-core: 1.6.7 Apache License @@ -37903,12 +37903,12 @@ gemfire-core: 1.6.5 limitations under the License. * -gemfire-jgroups 1.6.5 +gemfire-jgroups 1.6.7 This product includes software licensed under the GNU Lesser General Public License (LGPL) version 2.1. The source code for such software licensed under the LGPL v2.1 is available upon request to TIBCO at support@tibco.com. GNU Lesser General Public License Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. [This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) The modified work must itself be a software library. b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License). To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the library `Frob' (a library for tweaking knobs) written by James Random Hacker. signature of Ty Coon, 1 April 1990 Ty Coon, President of Vice That's all there is to it! * -gemfire-shared: 1.6.5 +gemfire-shared: 1.6.7 Apache License @@ -38114,12 +38114,12 @@ gemfire-shared: 1.6.5 limitations under the License. * -gemfire-trove 1.6.5 +gemfire-trove 1.6.7 This product includes software licensed under the GNU Lesser General Public License (LGPL) version 2.1. The source code for such software licensed under the LGPL v2.1 is available upon request to TIBCO at support@tibco.com. GNU Lesser General Public License Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. [This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) The modified work must itself be a software library. b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License). To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the library `Frob' (a library for tweaking knobs) written by James Random Hacker. signature of Ty Coon, 1 April 1990 Ty Coon, President of Vice That's all there is to it! * -gemfire-util: 1.6.5 +gemfire-util: 1.6.7 Apache License @@ -69080,7 +69080,7 @@ libfb303: 0.9.3 limitations under the License. * -libgemfirexd.dylib: 1.6.5 +libgemfirexd.dylib: 1.6.7 Apache License @@ -69286,7 +69286,7 @@ libgemfirexd.dylib: 1.6.5 limitations under the License. * -libgemfirexd.so: 1.6.5 +libgemfirexd.so: 1.6.7 Apache License @@ -69492,7 +69492,7 @@ libgemfirexd.so: 1.6.5 limitations under the License. * -libgemfirexd64.dylib: 1.6.5 +libgemfirexd64.dylib: 1.6.7 Apache License @@ -69698,7 +69698,7 @@ libgemfirexd64.dylib: 1.6.5 limitations under the License. * -libgemfirexd64.so: 1.6.5 +libgemfirexd64.so: 1.6.7 Apache License @@ -74792,7 +74792,7 @@ snappydata-launcher: 1.2.0 limitations under the License. * -snappydata-store-client: 1.6.5 +snappydata-store-client: 1.6.7 Apache License @@ -74998,7 +74998,7 @@ snappydata-store-client: 1.6.5 limitations under the License. * -snappydata-store-core: 1.6.5 +snappydata-store-core: 1.6.7 Apache License @@ -75204,7 +75204,7 @@ snappydata-store-core: 1.6.5 limitations under the License. * -snappydata-store-hibernate: 1.6.5 +snappydata-store-hibernate: 1.6.7 This product includes software licensed under the GNU Lesser General Public License (LGPL) version 2.1. The source code for such software licensed under the LGPL v2.1 is available upon request to TIBCO at support@tibco.com. @@ -75379,7 +75379,7 @@ Ty Coon, President of Vice That's all there is to it! * -snappydata-store-shared: 1.6.5 +snappydata-store-shared: 1.6.7 Apache License @@ -75585,7 +75585,7 @@ snappydata-store-shared: 1.6.5 limitations under the License. * -snappydata-store-tools: 1.6.5 +snappydata-store-tools: 1.6.7 Apache License diff --git a/NOTICE b/NOTICE index 5edc872806..5baa5883e8 100644 --- a/NOTICE +++ b/NOTICE @@ -21,7 +21,6 @@ antlr-runtime-3.4.jar BSD License: http://antlr.org/license.html antlr4-runtime-4.5.3.jar BSD License: http://antlr.org/license.html aopalliance-1.0.jar Public Domain aopalliance-repackaged-2.5.0-b42.jar CDDL/GPLv2+CE: https://glassfish.java.net/nonav/public/CDDL+GPL_1_1.html -apache-log4j-extras-1.2.17.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 arpack_combined_all-0.1.jar BSD License: http://www.opensource.org/licenses/bsd-license.php audience-annotations-0.5.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 avro-1.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 @@ -58,7 +57,7 @@ commons-modeler-2.0.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2. commons-net-3.6.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 commons-pool-1.6.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 commons-pool2-2.6.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -compress-lzf-1.0.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +compress-lzf-1.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 concurrentlinkedhashmap-lru-1.4.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 config-1.3.3.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 core-1.1.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 @@ -73,33 +72,33 @@ derby-10.14.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 eigenbase-properties-1.1.5.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 fastutil-core-8.5.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 flyway-core-3.2.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -gemfire-core-1.6.2.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -gemfire-jgroups-1.6.2.1.jar LGPL2.1: http://www.opensource.org/licenses/lgpl-2.1.php -gemfire-shared-1.6.2.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -gemfire-trove-1.6.2.1.jar LGPL2.1: http://www.opensource.org/licenses/lgpl-2.1.php -gemfire-util-1.6.2.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +gemfire-core-1.6.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +gemfire-jgroups-1.6.7.jar LGPL2.1: http://www.opensource.org/licenses/lgpl-2.1.php +gemfire-shared-1.6.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +gemfire-trove-1.6.7.jar LGPL2.1: http://www.opensource.org/licenses/lgpl-2.1.php +gemfire-util-1.6.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 gson-2.2.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 guava-14.0.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 guice-3.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 guice-servlet-3.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 h2-1.3.176.jar H2 License V1: http://h2database.com/html/license.html -hadoop-annotations-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-auth-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-aws-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-client-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-common-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-hdfs-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-mapreduce-client-app-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-mapreduce-client-common-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-mapreduce-client-core-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-mapreduce-client-jobclient-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-mapreduce-client-shuffle-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-yarn-api-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-yarn-client-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-yarn-common-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-yarn-server-common-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-yarn-server-nodemanager-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -hadoop-yarn-server-web-proxy-2.7.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-annotations-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-auth-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-aws-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-azure-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-azure-datalake-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-client-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-common-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-hdfs-client-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-mapreduce-client-common-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-mapreduce-client-core-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-mapreduce-client-jobclient-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-yarn-api-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-yarn-client-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-yarn-common-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-yarn-registry-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-yarn-server-common-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +hadoop-yarn-server-web-proxy-3.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 hammer.js MIT: http://www.opensource.org/licenses/mit-license.php hive-beeline-1.2.1.spark2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 hive-cli-1.2.1.spark2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 @@ -113,16 +112,18 @@ htrace-core-3.2.0-incubating.jar Apache V2: http://www.apache.org/licenses/LICE httpclient-4.5.6.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 httpcore-4.4.10.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 ivy-2.4.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jackson-annotations-2.6.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jackson-core-2.6.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jackson-core-asl-1.9.13.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jackson-databind-2.6.7.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jackson-jaxrs-1.9.13.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jackson-mapper-asl-1.9.13.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jackson-module-paranamer-2.6.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jackson-module-scala_2.11-2.6.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jackson-xc-1.9.13.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -janino-3.0.11.jar BSD: https://raw.githubusercontent.com/janino-compiler/janino/master/LICENSE +jackson-annotations-2.13.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jackson-core-2.13.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jackson-core-asl-1.9.14-atlassian-6.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jackson-databind-2.13.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jackson-dataformat-chor-2.13.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jackson-datatype-jdk8-2.13.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jackson-jaxrs-base-2.13.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jackson-jaxrs-json-provider-2.13.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jackson-mapper-asl-1.9.14-atlassian-6.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jackson-module-jaxb-annotations-2.13.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jackson-module-scala_2.11-2.13.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +janino-3.0.8.jar BSD: https://raw.githubusercontent.com/janino-compiler/janino/master/LICENSE java-xmlbuilder-1.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 javassist-3.22.0-CR2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 javax.annotation-api-1.2.jar CDDL/GPLv2+CE: https://glassfish.java.net/public/CDDL+GPL_1_1.html @@ -146,22 +147,22 @@ jersey-server-2.27.jar CDDL/GPLv2+CE: https://glassfish.java.net/public/CDDL+ jets3t-0.9.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 jettison-1.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 jetty-6.1.26.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jetty-client-9.2.26.v20180806.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jetty-continuation-9.2.26.v20180806.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jetty-http-9.2.26.v20180806.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jetty-io-9.2.26.v20180806.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jetty-jndi-9.2.26.v20180806.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jetty-plus-9.2.26.v20180806.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jetty-proxy-9.2.26.v20180806.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jetty-security-9.2.26.v20180806.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jetty-server-9.2.26.v20180806.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jetty-servlet-9.2.26.v20180806.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jetty-servlets-9.2.26.v20180806.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jetty-client-9.4.43.v20210629.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jetty-continuation-9.4.43.v20210629.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jetty-http-9.4.43.v20210629.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jetty-io-9.4.43.v20210629.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jetty-jndi-9.4.43.v20210629.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jetty-plus-9.4.43.v20210629.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jetty-proxy-9.4.43.v20210629.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jetty-security-9.4.43.v20210629.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jetty-server-9.4.43.v20210629.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jetty-servlet-9.4.43.v20210629.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jetty-servlets-9.4.43.v20210629.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 jetty-sslengine-6.1.26.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 jetty-util-6.1.26.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jetty-util-9.2.26.v20180806.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jetty-webapp-9.2.26.v20180806.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -jetty-xml-9.2.26.v20180806.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jetty-util-9.4.43.v20210629.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jetty-webapp-9.4.43.v20210629.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +jetty-xml-9.4.43.v20210629.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 jline-2.14.6.jar BSD: http://www.opensource.org/licenses/bsd-license.php jna-4.5.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 joda-convert-2.1.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 @@ -175,7 +176,8 @@ jsp-api-2.1.jar CDDL/GPLv2+CE: https://glassfish.java.net/public/CDDL+GPL_1_ jsr305-3.0.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 jta-1.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 jtransforms-2.4.0.jar MPL: http://www.mozilla.org/MPL/2.0/index.txt -jul-to-slf4j-1.7.25.jar MIT: http://www.opensource.org/licenses/mit-license.php +jcl-over-slf4j-1.7.32.jar MIT: http://www.opensource.org/licenses/mit-license.php +jul-to-slf4j-1.7.32.jar MIT: http://www.opensource.org/licenses/mit-license.php kafka-clients-0.10.0.1.jar Apache V2: http://jpam.sourceforge.net/LICENSE.txt kafka_2.11-0.10.0.1.jar Apache V2: http://jpam.sourceforge.net/LICENSE.txt kryo-shaded-4.0.2.jar BSD: http://www.opensource.org/licenses/bsd-license.php @@ -191,8 +193,11 @@ libnative64.dylib Apache V2: http://www.apache.org/licenses/LICENSE-2.0 libnative64.so Apache V2: http://www.apache.org/licenses/LICENSE-2.0 libthrift-0.9.3.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 liquidFillGauge.js BSD: http://choosealicense.com/licenses/bsd-2-clause -log4j-1.2.17.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -lz4-java-1.5.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +log4j-1.2-api-2.17.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +log4j-api-2.17.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +log4j-core-2.17.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +log4j-slf4j-impl-2.17.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +lz4-java-1.8.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 machinist_2.11-0.6.1.jar MIT: http://opensource.org/licenses/MIT macro-compat_2.11-1.1.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 metrics-core-2.2.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 @@ -207,7 +212,7 @@ mx4j-3.0.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 mx4j-remote-3.0.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 mx4j-tools-3.0.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 netty-3.10.6.Final.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -netty-all-4.0.56.Final.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +netty-all-4.1.73.Final.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 objenesis-3.0.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 opencsv-2.3.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 org.osgi.core-6.0.0.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 @@ -238,41 +243,40 @@ scalap-2.11.8.jar BSD-3: http://www.scala-lang.org/license.html servlet-api-2.5-20081211.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 shapeless_2.11-2.3.3.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 shiro-core-1.2.6.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -slf4j-api-1.7.25.jar MIT: http://www.opensource.org/licenses/mit-license.php -slf4j-log4j12-1.7.25.jar MIT: http://www.opensource.org/licenses/mit-license.php +slf4j-api-1.7.32.jar MIT: http://www.opensource.org/licenses/mit-license.php slick_2.11-2.1.0.jar BSD: http://github.com/slick/slick/blob/master/LICENSE.txt snappy-0.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-java-1.1.7.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-catalyst_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-core_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-graphx_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-hive-thriftserver_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-hive_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-launcher_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-mllib-local_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-mllib_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-network-common_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-network-shuffle_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-repl_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-sketch_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-sql_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-sql-kafka-0.10_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-streaming-kafka-0.10_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-streaming_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-tags_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-unsafe_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappy-spark-yarn_2.11-2.1.1.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappydata-aqp_2.11-1.0.2.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappydata-cluster_2.11-1.0.2.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappydata-core_2.11-1.0.2.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappydata-jdbc_2.11-1.0.2.1-only.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappydata-launcher-1.0.2.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappydata-store-client-1.6.2.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappydata-store-core-1.6.2.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappydata-store-hibernate-1.6.2.1.jar LGPL2.1: http://www.gnu.org/licenses/lgpl-2.1.html -snappydata-store-shared-1.6.2.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -snappydata-store-tools-1.6.2.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 -spark-jobserver_2.11-0.6.2.8.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-java-1.1.8.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-catalyst_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-core_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-graphx_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-hive-thriftserver_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-hive_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-launcher_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-mllib-local_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-mllib_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-network-common_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-network-shuffle_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-repl_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-sketch_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-sql_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-sql-kafka-0.10_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-streaming-kafka-0.10_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-streaming_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-tags_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-unsafe_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappy-spark-yarn_2.11-2.1.3.2.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappydata-aqp_2.11-1.3.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappydata-cluster_2.11-1.3.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappydata-core_2.11-1.3.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappydata-jdbc_2.11-1.3.1-only.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappydata-launcher-1.3.1.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappydata-store-client-1.6.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappydata-store-core-1.6.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappydata-store-hibernate-1.6.7.jar LGPL2.1: http://www.gnu.org/licenses/lgpl-2.1.html +snappydata-store-shared-1.6.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +snappydata-store-tools-1.6.7.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 +spark-jobserver_2.11-0.6.2.12.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 spire-macros_2.11-0.13.0.jar MIT: http://opensource.org/licenses/MIT spire_2.11-0.13.0.jar MIT: http://opensource.org/licenses/MIT spray-caching_2.11-1.3.4.jar Apache V2: http://www.apache.org/licenses/LICENSE-2.0 @@ -1008,7 +1012,7 @@ SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES SECTION 2: Apache License, V2.0 - >>> hadoop-common-2.7.7 + >>> hadoop-common-3.2.0 >>> swagger-ui-2.0.17 @@ -1178,7 +1182,7 @@ Copyright (C) 2006-2009 Dustin Sallings Apache License, V2.0 is applicable to the following component(s). ->>> hadoop-common-2.7.7 +>>> hadoop-common-3.2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/build.gradle b/build.gradle index 49139ebff7..8df76bc83f 100644 --- a/build.gradle +++ b/build.gradle @@ -108,9 +108,9 @@ allprojects { sparkDistName = "spark-${sparkVersion}-bin-hadoop2.7" sparkCurrentVersion = '2.4.8' sparkCurrentDistName = "spark-${sparkCurrentVersion}-bin-hadoop2.7" - sparkJobServerVersion = '0.6.2.12' + sparkJobServerVersion = '0.6.2.13' snappySparkMetricsLibVersion = '2.0.0.1' - log4j2Version = '2.17.1' + log4j2Version = '2.17.2' slf4jVersion = '1.7.32' junitVersion = '4.12' mockitoVersion = '1.10.19' @@ -121,7 +121,7 @@ allprojects { sparkXmlVersion = '0.4.1' scalatestVersion = '2.2.6' py4jVersion = '0.10.7' - jettyVersion = '9.4.44.v20210927' + jettyVersion = '9.4.43.v20210629' guavaVersion = '14.0.1' fastutilVersion = '8.5.6' kryoVersion = '4.0.1' @@ -159,7 +159,7 @@ allprojects { eclipseCollectionsVersion = '10.4.0' pegdownVersion = '1.6.0' - snappyStoreVersion = '1.6.6' + snappyStoreVersion = '1.6.7' snappydataVersion = version zeppelinInterpreterVersion = '0.8.2.1' diff --git a/cluster/bin/snappy b/cluster/bin/snappy index 8322ea97f5..cf134b1d0f 100755 --- a/cluster/bin/snappy +++ b/cluster/bin/snappy @@ -121,7 +121,7 @@ elif [ -z "$SNAPPY_NO_QUICK_LAUNCH" -a $# -ge 2 \ fi fi - JARS="`echo "${SPARK_HOME}"/jars/snappydata-launcher* "${SPARK_HOME}"/jars/gemfire-shared* "${SPARK_HOME}"/jars/log4j-* "${SPARK_HOME}"/jars/jna-4.* | sed 's/ /:/g'`" + JARS="${SPARK_HOME}/conf:`echo "${SPARK_HOME}"/jars/snappydata-launcher* "${SPARK_HOME}"/jars/gemfire-shared* "${SPARK_HOME}"/jars/log4j-* "${SPARK_HOME}"/jars/jna-4.* | sed 's/ /:/g'`" exec $RUNNER $JAVA_ARGS -Xverify:none -cp "$JARS" io.snappydata.tools.QuickLauncher "$@" $HOSTNAME_FOR_CLIENTS $IMPLICIT_AWS_CLIENT_BIND_ADDRESS IMPLICIT_CLIENT_BIND_ADDRESS= EXPLICIT_CLIENT_BIND_ADDRESS= diff --git a/cluster/conf/log4j2.properties.template b/cluster/conf/log4j2.properties.template index 3126fdbeac..46cfc82223 100644 --- a/cluster/conf/log4j2.properties.template +++ b/cluster/conf/log4j2.properties.template @@ -45,6 +45,7 @@ appender.rolling.fileName = snappydata.log appender.rolling.filePattern = snappydata.%d{yy-MM-dd}.%i.log.gz appender.rolling.append = true appender.rolling.policies.type = Policies +appender.rolling.policies.startup.type = OnStartupTriggeringPolicy appender.rolling.policies.size.type = SizeBasedTriggeringPolicy appender.rolling.policies.size.size = 100MB appender.rolling.strategy.type = DefaultRolloverStrategy @@ -59,6 +60,7 @@ appender.code.fileName = generatedcode.log appender.code.filePattern = generatedcode.%d{yy-MM-dd}.%i.log.gz appender.code.append = true appender.code.policies.type = Policies +appender.code.policies.startup.type = OnStartupTriggeringPolicy appender.code.policies.size.type = SizeBasedTriggeringPolicy appender.code.policies.size.size = 100MB appender.code.strategy.type = DefaultRolloverStrategy diff --git a/cluster/sbin/cluster-util.sh b/cluster/sbin/cluster-util.sh index 11e3102475..7dfa4dc94d 100755 --- a/cluster/sbin/cluster-util.sh +++ b/cluster/sbin/cluster-util.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved. # @@ -61,7 +61,7 @@ usage() { echo -e ' \t ''\t'"If specified, the script doesn't ask for confirmation for execution of the command on each member node." echo echo -e ' \t '"--copy-conf" - echo -e ' \t ''\t'"This is a shortcut command which when specified copies log4j.properties, snappy-env.sh and " + echo -e ' \t ''\t'"This is a shortcut command which when specified copies log4j2.properties, snappy-env.sh and " echo -e ' \t ''\t'"spark-env.sh configuration files from local machine to all the members." echo -e ' \t ''\t'"These files are copied only if a) these are absent in the destination member or b) their content is different. In " echo -e ' \t ''\t'"latter case, a backup of the file is taken in conf/backup directory on destination member, before copy." @@ -165,9 +165,9 @@ START_ALL_TIMESTAMP="$(date +"%Y_%m_%d_%H_%M_%S")" function copyConf() { for entry in "${SPARK_CONF_DIR}"/*; do - if [ -f "$entry" ];then + if [ -f "$entry" ]; then fileName=$(basename $entry) - if [[ $fileName == "log4j.properties" || $fileName == "snappy-env.sh" || $fileName == "spark-env.sh" ]]; then + if [[ $fileName == "log4j2.properties" || $fileName == "snappy-env.sh" || $fileName == "spark-env.sh" ]]; then if ! ssh $node "test -e $entry"; then #"File does not exist." scp ${SPARK_CONF_DIR}/$fileName $node:${SPARK_CONF_DIR} else diff --git a/cluster/src/dunit/scala/io/snappydata/cluster/SnappyMetricsSystemDUnitTest.scala b/cluster/src/dunit/scala/io/snappydata/cluster/SnappyMetricsSystemDUnitTest.scala index d4ab908b21..061721da74 100644 --- a/cluster/src/dunit/scala/io/snappydata/cluster/SnappyMetricsSystemDUnitTest.scala +++ b/cluster/src/dunit/scala/io/snappydata/cluster/SnappyMetricsSystemDUnitTest.scala @@ -83,7 +83,7 @@ class SnappyMetricsSystemDUnitTest(s: String) def collectJsonStats(): mutable.Map[String, AnyRef] = { val url = "http://localhost:9090/metrics/json/" // val json = scala.io.Source.fromURL(url).mkString - val json = s"curl $url".!! + val json = s"curl -s $url".!! val data = jsonStrToMap(json) val rs = data.-("counters", "meters", "histograms", "timers", "version") val map = scala.collection.mutable.LinkedHashMap[String, AnyRef]() diff --git a/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCPreparedStatementDUnitTest.scala b/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCPreparedStatementDUnitTest.scala index 2cb71e835e..de6c162f2f 100644 --- a/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCPreparedStatementDUnitTest.scala +++ b/cluster/src/dunit/scala/io/snappydata/externalstore/JDBCPreparedStatementDUnitTest.scala @@ -18,7 +18,7 @@ package io.snappydata.externalstore import java.sql.{PreparedStatement, SQLException} import java.util.concurrent.atomic.AtomicInteger -import java.util.concurrent.{CountDownLatch, CyclicBarrier, Executors, TimeoutException} +import java.util.concurrent.{CyclicBarrier, Executors, TimeoutException} import scala.concurrent.{Await, ExecutionContext, ExecutionContextExecutor, Future} import scala.util.Try @@ -207,11 +207,11 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s ps.setString(2, "str" + i) ps.addBatch() if (i % 10 == 0) { - var records = ps.executeBatch() + val records = ps.executeBatch() records.foreach(r => numRows += r) } } - var records = ps.executeBatch() + val records = ps.executeBatch() records.foreach(r => numRows += r) (1, numRows) } @@ -222,17 +222,16 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s val conn = getANetConnection(netPort1) val query1 = "update t3 set fs = ? where fs = ?" ps = conn.prepareStatement(query1) - var fs1 = 1 for (i <- val1 to val2) { ps.setString(1, "temp" + i) ps.setString(2, "str" + i) ps.addBatch() if (i % 10 == 0) { - var records = ps.executeBatch() + val records = ps.executeBatch() records.foreach(r => numRows += r) } } - var records = ps.executeBatch() + val records = ps.executeBatch() records.foreach(r => numRows += r) (1, numRows) } @@ -247,16 +246,16 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s ps.setString(1, "temp" + i2) ps.addBatch() if (i2 % 10 == 0) { - var records = ps.executeBatch() + val records = ps.executeBatch() records.foreach(r => numRows += r) } } - var records = ps.executeBatch() + val records = ps.executeBatch() records.foreach(r => numRows += r) (1, numRows) } - def testComplexDataTypes() : Unit = { + def testComplexDataTypes(): Unit = { vm2.invoke(classOf[ClusterManagerTestBase], "startNetServer", netPort1) val conn = getANetConnection(netPort1) val stmt = conn.createStatement() @@ -302,42 +301,40 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s val stmt = conn.createStatement() stmt.execute("drop table if exists t3") stmt.execute("create table t3(id integer, fs string) using column options" + - "(key_columns 'id', COLUMN_MAX_DELTA_ROWS '7', BUCKETS '2')") - - var thrCount1: Integer = 0 - var insertedRecords = 0 - val colThread1 = new Thread(new Runnable {def run() { - (1 to 5) foreach (i => { - var result = insertRecords(1, 10) - thrCount1 += result._1 - insertedRecords += result._2 - }) - } + "(COLUMN_MAX_DELTA_ROWS '7', BUCKETS '2')") + + val insertedRecords = new AtomicInteger(0) + val colThread1 = new Thread(new Runnable { + def run(): Unit = { + (1 to 5) foreach { _ => + val result = insertRecords(1, 10) + insertedRecords.getAndAdd(result._2) + } + } }) colThread1.start() - var thrCount2: Integer = 0 - val colThread2 = new Thread(new Runnable {def run() { - (1 to 5) foreach (i => { - var result = insertRecords(11, 20) - thrCount2 += result._1 - insertedRecords += result._2 - }) - } + val colThread2 = new Thread(new Runnable { + def run(): Unit = { + (1 to 5) foreach { _ => + val result = insertRecords(11, 20) + insertedRecords.getAndAdd(result._2) + } + } }) colThread2.start() colThread1.join() colThread2.join() + conn.commit() var rscnt = stmt.executeQuery("select count(*) from t3") rscnt.next() assertEquals(100, rscnt.getInt(1)) - assertEquals(100, insertedRecords) + assertEquals(100, insertedRecords.get()) val rs = stmt.executeQuery("select * from t3 order by id") - var i = 1 var cnt = 0 @@ -351,37 +348,34 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s cnt = cnt + 1 } - var thrCount3: Integer = 0 - var updatedRecords = 0 - val colThread3 = new Thread(new Runnable {def run() { - (1 to 5) foreach (i => { - var result = updateRecords(1, 20) - thrCount3 += result._1 - updatedRecords += result._2 - }) - } + val updatedRecords = new AtomicInteger(0) + val colThread3 = new Thread(new Runnable { + def run(): Unit = { + (1 to 5) foreach { _ => + val result = updateRecords(1, 20) + updatedRecords.getAndAdd(result._2) + } + } }) colThread3.start() - var thrCount4: Integer = 0 - val colThread4 = new Thread(new Runnable {def run() { - (1 to 5) foreach (i => { - var result = updateRecords(11, 20) - thrCount4 += result._1 - updatedRecords += result._2 - }) - } + val colThread4 = new Thread(new Runnable { + def run(): Unit = { + (1 to 5) foreach { _ => + val result = updateRecords(11, 20) + updatedRecords.getAndAdd(result._2) + } + } }) colThread4.start() - var thrCount5: Integer = 0 - val colThread5 = new Thread(new Runnable {def run() { - (1 to 5) foreach (i => { - var result = updateRecords(21, 30) - thrCount5 += result._1 - updatedRecords += result._2 - }) - } + val colThread5 = new Thread(new Runnable { + def run(): Unit = { + (1 to 5) foreach { _ => + val result = updateRecords(21, 30) + updatedRecords.getAndAdd(result._2) + } + } }) colThread5.start() @@ -389,13 +383,12 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s colThread4.join() colThread5.join() - rscnt = stmt.executeQuery("select count(*) from t3") rscnt.next() assertEquals(100, rscnt.getInt(1)) - assertEquals(100, updatedRecords) + assertEquals(100, updatedRecords.get()) - var rs1 = stmt.executeQuery("select * from t3 order by id") + val rs1 = stmt.executeQuery("select * from t3 order by id") var i2 = 1 cnt = 0 while (rs1.next()) { @@ -408,37 +401,34 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s cnt = cnt + 1 } - var thrCount6: Integer = 0 val deletedRecords = new AtomicInteger(0) - val colThread6 = new Thread(new Runnable {def run() { - (1 to 5) foreach (i => { - val result = deleteRecords(1, 20) - thrCount6 += result._1 - deletedRecords.getAndAdd(result._2) - }) - } + val colThread6 = new Thread(new Runnable { + def run(): Unit = { + (1 to 5) foreach { _ => + val result = deleteRecords(1, 20) + deletedRecords.getAndAdd(result._2) + } + } }) colThread6.start() - var thrCount7: Integer = 0 - val colThread7 = new Thread(new Runnable {def run() { - (1 to 5) foreach (i => { - val result = deleteRecords(11, 20) - thrCount7 += result._1 - deletedRecords.getAndAdd(result._2) - }) - } + val colThread7 = new Thread(new Runnable { + def run(): Unit = { + (1 to 5) foreach { _ => + val result = deleteRecords(11, 20) + deletedRecords.getAndAdd(result._2) + } + } }) colThread7.start() - var thrCount8: Integer = 0 - val colThread8 = new Thread(new Runnable {def run() { - (1 to 5) foreach (i => { - val result = deleteRecords(21, 30) - thrCount8 += result._1 - deletedRecords.getAndAdd(result._2) - }) - } + val colThread8 = new Thread(new Runnable { + def run(): Unit = { + (1 to 5) foreach { _ => + val result = deleteRecords(21, 30) + deletedRecords.getAndAdd(result._2) + } + } }) colThread8.start() @@ -449,7 +439,7 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s rscnt = stmt.executeQuery("select count(*) from t3") rscnt.next() assertEquals(0, rscnt.getInt(1)) - assertEquals(100, deletedRecords.get) + assertEquals(100, deletedRecords.get()) } def testQueryCancellation(): Unit = { @@ -462,7 +452,7 @@ class JDBCPreparedStatementDUnitTest(s: String) extends ClusterManagerTestBase(s // significantly long duration. stmt.execute( s"""create table $table (col1 int, col2 int) using column as - |select id as col1, id as col2 from range(10000000)""".stripMargin) + |select id as col1, id as col2 from range(10000000)""".stripMargin) val barrier = new CyclicBarrier(2) try { implicit val context: ExecutionContextExecutor = diff --git a/cluster/src/dunit/scala/org/apache/spark/sql/udf/UserDefinedFunctionsDUnitTest.scala b/cluster/src/dunit/scala/org/apache/spark/sql/udf/UserDefinedFunctionsDUnitTest.scala index 77c3cfdc51..2e4ba88ce8 100644 --- a/cluster/src/dunit/scala/org/apache/spark/sql/udf/UserDefinedFunctionsDUnitTest.scala +++ b/cluster/src/dunit/scala/org/apache/spark/sql/udf/UserDefinedFunctionsDUnitTest.scala @@ -25,6 +25,7 @@ import scala.util.{Failure, Success, Try} import io.snappydata.cluster.ClusterManagerTestBase import io.snappydata.test.dunit.{AvailablePortHelper, DistributedTestBase} +import org.apache.commons.io.FileUtils import org.apache.spark.{SparkUtilsAccess, TestUtils} import org.apache.spark.TestUtils.JavaSourceFromString @@ -36,6 +37,11 @@ case class OrderData(ref: Int, description: String, amount: Long) class UserDefinedFunctionsDUnitTest(val s: String) extends ClusterManagerTestBase(s) { + override def afterClass(): Unit = { + super.afterClass() + FileUtils.deleteQuietly(SparkUtilsAccess.destDir) + } + def testDriverHA(): Unit = { // Stop the lead node ClusterManagerTestBase.stopAny() diff --git a/cluster/src/main/scala/org/apache/spark/executor/SnappyExecutor.scala b/cluster/src/main/scala/org/apache/spark/executor/SnappyExecutor.scala index 3dfefbaf90..975b8d9eeb 100644 --- a/cluster/src/main/scala/org/apache/spark/executor/SnappyExecutor.scala +++ b/cluster/src/main/scala/org/apache/spark/executor/SnappyExecutor.scala @@ -32,6 +32,7 @@ import com.pivotal.gemfirexd.internal.engine.distributed.utils.GemFireXDUtils import org.apache.spark.deploy.SparkHadoopUtil import org.apache.spark.serializer.KryoSerializerPool import org.apache.spark.sql.internal.ContextJarUtils +import org.apache.spark.sql.internal.ContextJarUtils.droppedFunctionsKey import org.apache.spark.util.{MutableURLClassLoader, ShutdownHookManager, SparkExitCode, Utils} import org.apache.spark.{Logging, SparkConf, SparkEnv, SparkFiles} @@ -89,7 +90,7 @@ class SnappyExecutor( val appDependencies = appNameAndJars.drop(2).toSeq var urls = Seq.empty[URL] // Fetch urls only if appName is not in dropped functions list - if (!ContextJarUtils.checkItemExists(ContextJarUtils.droppedFunctionsKey, appName)) { + if (!ContextJarUtils.checkItemExists(droppedFunctionsKey, appName, droppedFunctionsKey)) { logInfo(s"Creating ClassLoader for $appName" + s" with dependencies $appDependencies") val includeInGlobalCmdRegion = @@ -108,8 +109,8 @@ class SnappyExecutor( // is not yet dropped. if (firstHyphen > -1) { val udfName = localName.substring(0, firstHyphen) - fetch = udfName.equalsIgnoreCase(appName) || - !ContextJarUtils.checkItemExists(ContextJarUtils.droppedFunctionsKey, udfName) + fetch = udfName.equalsIgnoreCase(appName) || !ContextJarUtils.checkItemExists( + droppedFunctionsKey, udfName, droppedFunctionsKey) } if (fetch && !name.equalsIgnoreCase(io.snappydata.Constant.SNAPPY_JOB_URL)) { logInfo(s"Fetching file $name for App[$appName]") @@ -174,6 +175,9 @@ class SnappyExecutor( def setUserClassPathFirst(userClassPathFirst: Boolean): Unit = { this.userClasspathFirst = userClassPathFirst } + + override def toString: String = + s"ClassLoaderKey[appName=$appName, appTime=$appTime, isReplPath=$isReplPath]" } override def updateDependencies(newFiles: mutable.HashMap[String, Long], @@ -282,7 +286,6 @@ class SnappyMutableURLClassLoader(urls: Array[URL], parent: ClassLoader) extends MutableURLClassLoader(urls, parent) with Logging { - override def loadClass(name: String, resolve: Boolean): Class[_] = { loadJar(() => super.loadClass(name, resolve)). getOrElse(loadJar(() => Misc.getMemStore.getDatabase.getClassFactory.loadClassFromDB(name), diff --git a/cluster/src/main/scala/org/apache/spark/util/SnappyUtils.scala b/cluster/src/main/scala/org/apache/spark/util/SnappyUtils.scala index de8b07dec2..042a5cdf81 100644 --- a/cluster/src/main/scala/org/apache/spark/util/SnappyUtils.scala +++ b/cluster/src/main/scala/org/apache/spark/util/SnappyUtils.scala @@ -46,7 +46,7 @@ object SnappyUtils { classLoader: ClassLoader, addAllJars: Boolean = false): Unit = { assert(classOf[URLClassLoader].isAssignableFrom(classLoader.getClass)) val dependentJars = if (addAllJars) { - ContextJarUtils.getDriverJarURLs() + ContextJarUtils.getDriverJarURLs } else { classLoader.asInstanceOf[URLClassLoader].getURLs } diff --git a/cluster/src/test/scala/org/apache/spark/memory/SnappyStorageEvictorSuite.scala b/cluster/src/test/scala/org/apache/spark/memory/SnappyStorageEvictorSuite.scala index 32c5c8f99f..166e3aa18e 100644 --- a/cluster/src/test/scala/org/apache/spark/memory/SnappyStorageEvictorSuite.scala +++ b/cluster/src/test/scala/org/apache/spark/memory/SnappyStorageEvictorSuite.scala @@ -75,9 +75,11 @@ class SnappyStorageEvictorSuite extends MemoryFunSuite { assert(SparkEnv.get.memoryManager.storageMemoryUsed == 0) val row = Row(1, 1, 1) snSession.insert("t1", row) + assert(snSession.table("t1").count() === 1) val afterInsertSize = SparkEnv.get.memoryManager.storageMemoryUsed assert( afterInsertSize > 0) // borrowed from execution memory snSession.delete("t1", "col1=1") + assert(snSession.table("t1").count() === 0) val afterDeleteSize = SparkEnv.get.memoryManager.storageMemoryUsed assert(afterDeleteSize < afterInsertSize) snSession.dropTable("t1") diff --git a/core/src/dunit/scala/io/snappydata/cluster/CassandraSnappyDUnitTest.scala b/core/src/dunit/scala/io/snappydata/cluster/CassandraSnappyDUnitTest.scala index d901726404..59ef6db579 100644 --- a/core/src/dunit/scala/io/snappydata/cluster/CassandraSnappyDUnitTest.scala +++ b/core/src/dunit/scala/io/snappydata/cluster/CassandraSnappyDUnitTest.scala @@ -134,10 +134,13 @@ class CassandraSnappyDUnitTest(val s: String) stopSnappyCluster() logInfo("Stopping cassandra cluster") - val p = Runtime.getRuntime.exec("pkill -f cassandra") - p.waitFor() - p.exitValue() == 0 - logInfo("Cassandra cluster stopped successfully") + val cmd = "pkill -f cassandra" + val p = Runtime.getRuntime.exec(cmd) + val msg = p.waitFor() match { + case 0 => "Cassandra cluster stopped successfully" + case exitCode => s"Failed to stop cassandra cluster with '$cmd' (exitCode=$exitCode)" + } + logInfo(msg) } private def downloadURI(url: String): String = { diff --git a/core/src/dunit/scala/io/snappydata/cluster/ClusterUtils.scala b/core/src/dunit/scala/io/snappydata/cluster/ClusterUtils.scala index c25a7711b7..d3097d4ac5 100644 --- a/core/src/dunit/scala/io/snappydata/cluster/ClusterUtils.scala +++ b/core/src/dunit/scala/io/snappydata/cluster/ClusterUtils.scala @@ -128,6 +128,7 @@ object ClusterUtils extends Serializable with Logging { Files.deleteIfExists(Paths.get(clusterDir, "conf", "snappy-env.sh")) Files.deleteIfExists(Paths.get(clusterDir, "conf", "spark-env.sh")) Files.deleteIfExists(Paths.get(clusterDir, "conf", "log4j.properties")) + Files.deleteIfExists(Paths.get(clusterDir, "conf", "log4j2.properties")) } def getEnvironmentVariable(name: String): String = { @@ -162,6 +163,7 @@ object ClusterUtils extends Serializable with Logging { logInfo(s"$clusterDir/sbin/stop-all.sh".!!) Files.deleteIfExists(Paths.get(clusterDir, "conf", "spark-env.sh")) Files.deleteIfExists(Paths.get(clusterDir, "conf", "log4j.properties")) + Files.deleteIfExists(Paths.get(clusterDir, "conf", "log4j2.properties")) Files.deleteIfExists(Paths.get(clusterDir, "conf", "workers")) } diff --git a/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitSecurityTest.scala b/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitSecurityTest.scala index c73973973c..9875e56018 100644 --- a/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitSecurityTest.scala +++ b/core/src/dunit/scala/io/snappydata/cluster/SplitClusterDUnitSecurityTest.scala @@ -32,6 +32,7 @@ import io.snappydata.Constant import io.snappydata.test.dunit.DistributedTestBase.WaitCriterion import io.snappydata.test.dunit._ import io.snappydata.util.TestUtils +import org.apache.commons.io.FileUtils import org.apache.spark.SparkUtilsAccess import org.apache.spark.sql._ @@ -70,6 +71,14 @@ class SplitClusterDUnitSecurityTest(s: String) var vm2: VM = _ var vm3: VM = _ + if (Host.getHostCount > 0) { + host = Host.getHost(0) + vm0 = host.getVM(0) + vm1 = host.getVM(1) + vm2 = host.getVM(2) + vm3 = host.getVM(3) + } + val jdbcUser1 = "gemfire1" val jdbcUser2 = "gemfire2" val jdbcUser3 = "gemfire3" @@ -181,6 +190,7 @@ class SplitClusterDUnitSecurityTest(s: String) stopSparkCluster() stopSnappyCluster() stopLdapTestServer() + FileUtils.deleteQuietly(SparkUtilsAccess.destDir) } def stopLdapTestServer(): Unit = { diff --git a/core/src/dunit/scala/org/apache/spark/SparkUtilsAccess.scala b/core/src/dunit/scala/org/apache/spark/SparkUtilsAccess.scala index 456f5e9560..14280da8ff 100644 --- a/core/src/dunit/scala/org/apache/spark/SparkUtilsAccess.scala +++ b/core/src/dunit/scala/org/apache/spark/SparkUtilsAccess.scala @@ -22,12 +22,10 @@ import org.apache.spark.TestUtils.JavaSourceFromString object SparkUtilsAccess { - private val userDir = System.getProperty("user.dir") - def destDir: File = { - val jarDir = new File(s"$userDir/jars") + val jarDir = new File("/tmp/snappy-test-jars") if (!jarDir.exists()) { - jarDir.mkdir() + jarDir.mkdirs() } jarDir } diff --git a/core/src/main/scala/io/snappydata/sql/catalog/impl/StoreHiveCatalog.scala b/core/src/main/scala/io/snappydata/sql/catalog/impl/StoreHiveCatalog.scala index 2db1c50eaa..b0fef9c017 100644 --- a/core/src/main/scala/io/snappydata/sql/catalog/impl/StoreHiveCatalog.scala +++ b/core/src/main/scala/io/snappydata/sql/catalog/impl/StoreHiveCatalog.scala @@ -725,7 +725,8 @@ class StoreHiveCatalog extends ExternalCatalog with Logging { checkSchemaPermission(schema, functionObj.getFunctionName, user) val catalogFunction = ConnectorExternalCatalog.convertToCatalogFunction(functionObj) externalCatalog.createFunction(schema, catalogFunction) - ContextJarUtils.addFunctionArtifacts(catalogFunction, schema) + val functionKey = catalogFunction.identifier.copy(database = Some(schema)).unquotedString + ContextJarUtils.addFunctionArtifacts(catalogFunction, functionKey) case snappydataConstants.CATALOG_DROP_FUNCTION => assert(request.getNamesSize == 2, "DROP FUNCTION: unexpected names = " + request.getNames) diff --git a/core/src/main/scala/org/apache/spark/sql/internal/JarUtils.scala b/core/src/main/scala/org/apache/spark/sql/internal/ContextJarUtils.scala similarity index 65% rename from core/src/main/scala/org/apache/spark/sql/internal/JarUtils.scala rename to core/src/main/scala/org/apache/spark/sql/internal/ContextJarUtils.scala index d1b3d5e23f..dde5c0adbb 100644 --- a/core/src/main/scala/org/apache/spark/sql/internal/JarUtils.scala +++ b/core/src/main/scala/org/apache/spark/sql/internal/ContextJarUtils.scala @@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap import scala.collection.JavaConverters._ import scala.collection.mutable +import scala.util.matching.Regex import com.pivotal.gemfirexd.internal.engine.Misc import io.snappydata.sql.catalog.SnappyExternalCatalog @@ -46,11 +47,11 @@ import org.apache.spark.sql.{AnalysisException, SnappyContext} * */ object ContextJarUtils extends Logging { - val JAR_PATH = "snappy-jars" - private val driverJars = new ConcurrentHashMap[String, URLClassLoader]().asScala - val functionKeyPrefix = "__FUNC__" - val droppedFunctionsKey = functionKeyPrefix + "DROPPED__" - val DELIMITER = "," + final val JAR_PATH: String = "snappy-jars" + private final val driverJars = new ConcurrentHashMap[String, URLClassLoader]().asScala + final val functionKeyPrefix: String = "__FUNC__" + final val droppedFunctionsKey: String = functionKeyPrefix + "DROPPED__" + final val DELIMITER: String = "," def addDriverJar(key: String, classLoader: URLClassLoader): Option[URLClassLoader] = { driverJars.putIfAbsent(key, classLoader) @@ -58,10 +59,10 @@ object ContextJarUtils extends Logging { def getDriverJar(key: String): Option[URLClassLoader] = driverJars.get(key) - def removeDriverJar(key: String) : Unit = driverJars.remove(key) + def removeDriverJar(key: String): Unit = driverJars.remove(key) - def getDriverJarURLs(): Array[URL] = { - var urls = new mutable.HashSet[URL]() + def getDriverJarURLs: Array[URL] = { + val urls = new mutable.HashSet[URL]() driverJars.foreach(_._2.getURLs.foreach(urls += _)) urls.toArray } @@ -77,7 +78,7 @@ object ContextJarUtils extends Logging { def fetchFile(prefix: String, path: String): URL = { val callbacks = ToolsCallbackInit.toolsCallback val localName = path.split("/").last - val changedFileName = s"${prefix}-${localName}" + val changedFileName = s"$prefix-$localName" logInfo(s"Fetching jar $path to driver local directory $jarDir") val changedFile = new File(jarDir, changedFileName) if (!changedFile.exists()) { @@ -90,13 +91,13 @@ object ContextJarUtils extends Logging { val callbacks = ToolsCallbackInit.toolsCallback if (callbacks != null) { val localName = path.split("/").last - val changedFileName = s"${prefix}-${localName}" + val changedFileName = s"$prefix-$localName" val jarFile = new File(jarDir, changedFileName) try { if (isEmbedded) { // Add to the list in (__FUNC__DROPPED__, dropped-udf-list) - addToTheListInCmdRegion(droppedFunctionsKey, prefix + DELIMITER, droppedFunctionsKey) + addToTheListInCmdRegion(droppedFunctionsKey, prefix, droppedFunctionsKey) } if (jarFile.exists()) { jarFile.delete() @@ -120,7 +121,7 @@ object ContextJarUtils extends Logging { try { val catalogFunction = externalCatalog.getFunction(schemaName, identifier.funcName) catalogFunction.resources.foreach { r => - deleteFile(catalogFunction.identifier.toString(), r.uri, isEmbeddedMode) + deleteFile(catalogFunction.identifier.unquotedString, r.uri, isEmbeddedMode) } } catch { case e: AnalysisException => @@ -135,13 +136,12 @@ object ContextJarUtils extends Logging { } } - def addFunctionArtifacts(funcDefinition: CatalogFunction, schemaName: String): Unit = { - val k = funcDefinition.identifier.copy(database = Some(schemaName)).toString + def addFunctionArtifacts(funcDefinition: CatalogFunction, key: String): Unit = { // resources has just one jar val jarPath = if (funcDefinition.resources.isEmpty) "" else funcDefinition.resources.head.uri - Misc.getMemStore.getMetadataCmdRgn.put(ContextJarUtils.functionKeyPrefix + k, jarPath) + Misc.getMemStore.getMetadataCmdRgn.put(functionKeyPrefix + key, jarPath) // Remove from the list in (__FUNC__DROPPED__, dropped-udf-list) - removeFromTheListInCmdRegion(ContextJarUtils.droppedFunctionsKey, k + ContextJarUtils.DELIMITER) + removeFromTheListInCmdRegion(droppedFunctionsKey, key, droppedFunctionsKey) } private def sparkContext = SnappyContext.globalSparkContext @@ -152,40 +152,50 @@ object ContextJarUtils extends Logging { jarDirectory } + private def regexForItemInTheList(item: String, head: String): Regex = { + val pattern = s"^$head(.*$DELIMITER)?($item$DELIMITER)(.*)$$" + pattern.r + } + def addToTheListInCmdRegion(k: String, item: String, head: String): Unit = { val r = Misc.getMemStore.getMetadataCmdRgn - var old1: String = null - var old2: AnyRef = null + var replaced = false + val findItemRegex = regexForItemInTheList(item, head) do { - val oldObj = r.get(k) - old1 = if ( oldObj != null ) oldObj.asInstanceOf[String] else null - val newValue = if (old1 != null) old1 + item else head + item - old2 = r.put(k, newValue) - } while (old1 != old2) + replaced = r.get(k) match { + // An older put may have already succeeded but another thread may have changed + // the value, so first check if item is already present. + // NOTE: not using region.replace(k, old, new) because it doesn't work correctly + // from a data node though works from accessor node. + case oldValue: String => findItemRegex.findFirstIn(oldValue).isDefined || + oldValue.equals(r.put(k, oldValue + item + DELIMITER)) + case _ => r.putIfAbsent(k, head + item + DELIMITER) eq null + } + } while (!replaced) } - def removeFromTheListInCmdRegion(k: String, item: String): Unit = { + def removeFromTheListInCmdRegion(k: String, item: String, head: String): Unit = { val r = Misc.getMemStore.getMetadataCmdRgn - var old1: String = null - var old2: AnyRef = null + var replaced = false + val findItemRegex = regexForItemInTheList(item, head) do { - val oldObj = r.get(k) - if (oldObj != null) { - old1 = oldObj.asInstanceOf[String] - val newValue = old1.replace(item, "") - old2 = r.put(k, newValue) + replaced = r.get(k) match { + // An older put may have already succeeded but another thread may have changed + // the value, so first check if item has already been removed. + // NOTE: not using region.replace(k, old, new) because it doesn't work correctly + // from a data node though works from accessor node. + case oldValue: String => findItemRegex.findFirstIn(oldValue).isEmpty || + oldValue.equals(r.put(k, findItemRegex.replaceFirstIn(oldValue, head + "$1$3"))) + case _ => true } - } while (old1 != old2.asInstanceOf[String]) + } while (!replaced) } - def checkItemExists(k: String, item: String): Boolean = { - var value = Misc.getMemStore.getMetadataCmdRgn.get(k) + def checkItemExists(k: String, item: String, head: String): Boolean = { + val value = Misc.getMemStore.getMetadataCmdRgn.get(k) if (value != null) { val valueStr = value.asInstanceOf[String] - return valueStr.contains(item) - } - false + regexForItemInTheList(item, head).findFirstIn(valueStr).isDefined + } else false } } - - diff --git a/core/src/main/scala/org/apache/spark/sql/internal/SnappySessionCatalog.scala b/core/src/main/scala/org/apache/spark/sql/internal/SnappySessionCatalog.scala index 8f93a25dc2..a259e84907 100644 --- a/core/src/main/scala/org/apache/spark/sql/internal/SnappySessionCatalog.scala +++ b/core/src/main/scala/org/apache/spark/sql/internal/SnappySessionCatalog.scala @@ -1152,10 +1152,16 @@ class SnappySessionCatalog(val externalCatalog: SnappyExternalCatalog, checkSchemaPermission(schemaName, funcDefinition.identifier.funcName, defaultUser = null) createSchema(schemaName, ignoreIfExists = true) + val functionKey = funcDefinition.identifier.copy(database = Some(schemaName)).unquotedString + // function name cannot contain the DELIMITER used to separate values in the meta-data + if (functionKey.contains(ContextJarUtils.DELIMITER)) { + throw new AnalysisException( + s"Function name '$functionKey' cannot contain ${ContextJarUtils.DELIMITER}") + } super.createFunction(funcDefinition, ignoreIfExists) if (isEmbeddedMode) { - ContextJarUtils.addFunctionArtifacts(funcDefinition, schemaName) + ContextJarUtils.addFunctionArtifacts(funcDefinition, functionKey) } } diff --git a/docs/configuring_cluster/configuring_cluster.md b/docs/configuring_cluster/configuring_cluster.md index 1483f3eb91..a72639ec0c 100644 --- a/docs/configuring_cluster/configuring_cluster.md +++ b/docs/configuring_cluster/configuring_cluster.md @@ -272,15 +272,17 @@ export SPARK_DIST_CLASSPATH=$($OTHER_HADOOP_HOME/bin/hadoop classpath) ## Logging Currently, log files for SnappyData components go inside the working directory. To change the log file directory, you can specify a property _-log-file_ as the path of the directory.
-The logging levels can be modified by adding a *conf/log4j.properties* file in the product directory. +The logging levels can be modified by adding a *conf/log4j2.properties* file in the product directory. ```pre -$ cat conf/log4j.properties -log4j.logger.org.apache.spark.scheduler.DAGScheduler=DEBUG -log4j.logger.org.apache.spark.scheduler.TaskSetManager=DEBUG +$ cat conf/log4j2.properties +logger.dag.name = org.apache.spark.scheduler.DAGScheduler +logger.dag.level = debug +logger.taskset.name = org.apache.spark.scheduler.TaskSetManager +logger.taskset.level = debug ``` !!! Note - For a set of applicable class names and default values see the file **conf/log4j.properties.template**, which can be used as a starting point. Consult the [log4j 1.2.x documentation](http://logging.apache.org/log4j/) for more details on the configuration file. + For a set of applicable class names and default values see the file **conf/log4j2.properties.template**, which can be used as a starting point. Consult the [log4j 2 documentation](http://logging.apache.org/log4j/) for more details on the configuration file. ## Auto-Configuring Off-Heap Memory Size diff --git a/docs/howto/start_snappy_cluster.md b/docs/howto/start_snappy_cluster.md index a66ef4bcaf..6643dcc8dd 100644 --- a/docs/howto/start_snappy_cluster.md +++ b/docs/howto/start_snappy_cluster.md @@ -91,7 +91,7 @@ You can use the cluster-util.sh utility to execute a given command on selected m If specified, the script does not prompt for the confirmation to execute the command on each member node. * `--copy-conf`
- This is a shortcut command. When you specify this comand, the log4j.properties, snappy-env.sh and spark-env.sh configuration files are copied from the local machine to all the members. These files are copied only in the following conditions: + This is a shortcut command. When you specify this comand, the log4j2.properties, snappy-env.sh and spark-env.sh configuration files are copied from the local machine to all the members. These files are copied only in the following conditions: * If these are absent in the destination member * If their content is different. In latter case, a backup of the file is taken in **conf/backup** directory, on the destination member, before copy. diff --git a/docs/kubernetes.md b/docs/kubernetes.md index aa41ab1e1f..fafcf2d128 100644 --- a/docs/kubernetes.md +++ b/docs/kubernetes.md @@ -353,12 +353,12 @@ bash-4.1# ls /data0/snappydata-server-0/*.*log ## Configuring the Log Level -You can provide a **log4j.properties** file while installing the SnappyData Helm chart. A template file **log4j.properties.template** is provided in the `charts/snappydata/conf/` directory. This template file can be renamed and used to configure log level as shown in the following example: +You can provide a **log4j2.properties** file while installing the SnappyData Helm chart. A template file **log4j2.properties.template** is provided in the `charts/snappydata/conf/` directory. This template file can be renamed and used to configure log level as shown in the following example: ``` $ cd charts/snappydata/conf/ # copy the template file and edit it to configure log level -$ cp log4j.properties.template log4j.properties +$ cp log4j2.properties.template log4j2.properties ``` When SnappyData chart is installed, the **log4.properties** file will be used to configure the log level. diff --git a/encoders/src/main/scala/org/apache/spark/Logging.scala b/encoders/src/main/scala/org/apache/spark/Logging.scala index 9769c8204b..32a85cb1a7 100644 --- a/encoders/src/main/scala/org/apache/spark/Logging.scala +++ b/encoders/src/main/scala/org/apache/spark/Logging.scala @@ -164,7 +164,10 @@ trait Logging { } private def initializeLogging(): Unit = { - ClientSharedUtils.initLog4j(null, null, "org/apache/spark/log4j${version}-defaults.properties") + if (ClientSharedUtils.isDefaultLoggingConfiguration) { + ClientSharedUtils.initLog4j(null, null, + "org/apache/spark/log4j${version}-defaults.properties") + } Logging.initialized = true // Force a call into slf4j to initialize it. Avoids this happening from multiple threads diff --git a/jdbc/build.gradle b/jdbc/build.gradle index 1840f9e638..e4a2e39181 100644 --- a/jdbc/build.gradle +++ b/jdbc/build.gradle @@ -88,7 +88,9 @@ shadowJar { exclude 'log4j.properties' exclude 'log4j2.properties' exclude 'console-log4j.properties' + exclude 'console-log4j2.properties' exclude 'store-log4j.properties' + exclude 'store-log4j2.properties' exclude 'io/snappydata/log4j/**' exclude '**/Log4j1Configurator*' diff --git a/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java b/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java index 3431e5ff94..a44431bfc0 100644 --- a/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java +++ b/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java @@ -195,6 +195,7 @@ private int start(final String[] args) throws IOException, InterruptedException if (logFile == null || logFile.isEmpty()) { logFile = this.defaultLogFileName; } + this.startLogFileName = "start_" + logFile; options.put(LOG_FILE, "-" + LOG_FILE + '=' + logFile); // add the command options @@ -203,7 +204,6 @@ private int start(final String[] args) throws IOException, InterruptedException } // finally launch the main process - assert startLogFileName != null; assert pidFileName != null; final Path startLogFile = this.workingDir.resolve(startLogFileName); final Path pidFile = this.workingDir.resolve(pidFileName); diff --git a/spark b/spark index e3efda3628..cdd6d29c67 160000 --- a/spark +++ b/spark @@ -1 +1 @@ -Subproject commit e3efda3628b96143021ab84c946817567b12ffae +Subproject commit cdd6d29c6706ba453515c14adfc0a851cade9f77 diff --git a/spark-jobserver b/spark-jobserver index 3f1fe65a7d..2d6bd074d7 160000 --- a/spark-jobserver +++ b/spark-jobserver @@ -1 +1 @@ -Subproject commit 3f1fe65a7d2a193788d7713f30b9191c614f1f8c +Subproject commit 2d6bd074d72e1995a99432af24b906eb2c10e358 diff --git a/store b/store index 8eaea60def..8577152c7e 160000 --- a/store +++ b/store @@ -1 +1 @@ -Subproject commit 8eaea60defa1f46e304cf588d7792057242b9bce +Subproject commit 8577152c7ed65923a0deb9028a82c4cc3f59255d