Permalink
Browse files

Cut 2.3.0

Merge branch 'next'
  • Loading branch information...
2 parents c185b27 + 8993ccf commit cac608ad7bfaf6315fd2319a8af37da307abdeb9 @manolama manolama committed Dec 31, 2016
Showing with 28,063 additions and 1,444 deletions.
  1. +7 −1 .gitignore
  2. +1 −0 .travis.yml
  3. +1 −0 AUTHORS
  4. +131 −11 Makefile.am
  5. +65 −0 NEWS
  6. +12 −0 THANKS
  7. +1 −1 build-aux/deb/logback.xml
  8. +3 −0 build-aux/gen_build_data.sh
  9. +1 −1 build-aux/rpm/logback.xml
  10. +9 −0 build-bigtable.sh
  11. +9 −0 build-cassandra.sh
  12. +22 −2 configure.ac
  13. +113 −31 pom.xml.in
  14. +1 −0 src/META-INF/MANIFEST.MF
  15. +1 −0 src/META-INF/services/net.opentsdb.uid.UniqueIdFilterPlugin
  16. +57 −8 src/core/AggregationIterator.java
  17. +2 −2 src/core/Aggregator.java
  18. +221 −1 src/core/Aggregators.java
  19. +5 −0 src/core/AppendDataPoints.java
  20. +13 −2 src/core/BatchedDataPoints.java
  21. +16 −1 src/core/Const.java
  22. +13 −0 src/core/DataPoints.java
  23. +195 −32 src/core/Downsampler.java
  24. +80 −2 src/core/DownsamplingSpecification.java
  25. +9 −2 src/core/FillPolicy.java
  26. +98 −17 src/core/FillingDownsampler.java
  27. +94 −52 src/core/IncomingDataPoints.java
  28. +11 −0 src/core/Internal.java
  29. +10 −0 src/core/MutableDataPoint.java
  30. +1 −1 src/core/Query.java
  31. +11 −0 src/core/RowSeq.java
  32. +36 −0 src/core/Span.java
  33. +73 −16 src/core/SpanGroup.java
  34. +332 −59 src/core/TSDB.java
  35. +36 −1 src/core/TSQuery.java
  36. +67 −6 src/core/TSSubQuery.java
  37. +84 −8 src/core/Tags.java
  38. +75 −43 src/core/TsdbQuery.java
  39. +99 −0 src/core/WriteableDataPointFilterPlugin.java
  40. +141 −0 src/examples/AddDataExample.java
  41. +198 −0 src/examples/QueryExample.java
  42. +73 −0 src/meta/MetaDataCache.java
  43. +13 −2 src/opentsdb.conf
  44. +74 −0 src/parser.jj
  45. +142 −3 src/query/QueryUtil.java
  46. +89 −0 src/query/expression/Absolute.java
  47. +100 −0 src/query/expression/Alias.java
  48. +85 −0 src/query/expression/DiffSeries.java
  49. +86 −0 src/query/expression/DivideSeries.java
  50. +246 −0 src/query/expression/EDPtoDPS.java
  51. +46 −0 src/query/expression/Expression.java
  52. +253 −0 src/query/expression/ExpressionDataPoint.java
  53. +95 −0 src/query/expression/ExpressionFactory.java
  54. +472 −0 src/query/expression/ExpressionIterator.java
  55. +156 −0 src/query/expression/ExpressionReader.java
  56. +257 −0 src/query/expression/ExpressionTree.java
  57. +166 −0 src/query/expression/Expressions.java
  58. +279 −0 src/query/expression/HighestCurrent.java
  59. +293 −0 src/query/expression/HighestMax.java
  60. +89 −0 src/query/expression/ITimeSyncedIterator.java
  61. +521 −0 src/query/expression/IntersectionIterator.java
  62. +345 −0 src/query/expression/MovingAverage.java
  63. +86 −0 src/query/expression/MultiplySeries.java
  64. +176 −0 src/query/expression/NumericFillPolicy.java
  65. +252 −0 src/query/expression/PostAggregatedDataPoints.java
  66. +110 −0 src/query/expression/Scale.java
  67. +85 −0 src/query/expression/SumSeries.java
  68. +135 −0 src/query/expression/TimeShift.java
  69. +248 −0 src/query/expression/TimeSyncedIterator.java
  70. +455 −0 src/query/expression/UnionIterator.java
  71. +115 −0 src/query/expression/VariableIterator.java
  72. +146 −0 src/query/pojo/Downsampler.java
  73. +198 −0 src/query/pojo/Expression.java
  74. +134 −0 src/query/pojo/Filter.java
  75. +132 −0 src/query/pojo/Join.java
  76. +206 −0 src/query/pojo/Metric.java
  77. +117 −0 src/query/pojo/Output.java
  78. +292 −0 src/query/pojo/Query.java
  79. +208 −0 src/query/pojo/Timespan.java
  80. +59 −0 src/query/pojo/Validatable.java
  81. +30 −2 src/stats/StatsCollector.java
  82. +8 −2 src/tools/CliOptions.java
  83. +13 −3 src/tools/DumpSeries.java
  84. +85 −0 src/tools/StartupPlugin.java
  85. +82 −2 src/tools/TSDMain.java
  86. +4 −0 src/tools/TextImporter.java
  87. +19 −3 src/tsd/AbstractHttpQuery.java
  88. +63 −2 src/tsd/ConnectionManager.java
  89. +88 −0 src/tsd/DropCachesRpc.java
  90. +29 −0 src/tsd/HttpJsonSerializer.java
  91. +0 −49 src/tsd/HttpQuery.java
  92. +25 −0 src/tsd/HttpSerializer.java
  93. +28 −11 src/tsd/PipelineFactory.java
  94. +980 −0 src/tsd/QueryExecutor.java
  95. +87 −5 src/tsd/QueryRpc.java
  96. +136 −180 src/tsd/RpcManager.java
  97. +37 −0 src/tsd/RpcUtil.java
  98. +67 −0 src/tsd/UniqueIdRpc.java
  99. +13 −0 src/tsd/client/QueryUi.java
  100. +18 −0 src/uid/FailedToAssignUniqueIdException.java
  101. +151 −22 src/uid/UniqueId.java
  102. +101 −0 src/uid/UniqueIdFilterPlugin.java
  103. +200 −0 src/uid/UniqueIdWhitelistFilter.java
  104. +110 −0 src/utils/ByteSet.java
  105. +20 −0 src/utils/Config.java
  106. +267 −1 src/utils/DateTime.java
  107. +1 −1 src/utils/PluginLoader.java
  108. +103 −0 test/core/BaseTsdbTest.java
  109. +143 −60 test/core/SeekableViewsForTest.java
  110. +85 −31 test/core/TestAggregators.java
  111. +1,031 −7 test/core/TestDownsampler.java
  112. +125 −10 test/core/TestDownsamplingSpecification.java
  113. +706 −39 test/core/TestFillingDownsampler.java
  114. +113 −1 test/core/TestRowSeq.java
  115. +119 −0 test/core/TestSpan.java
  116. +67 −4 test/core/TestSpanGroup.java
  117. +28 −611 test/core/TestTSDB.java
  118. +690 −0 test/core/TestTSDBAddPoint.java
  119. +65 −0 test/core/TestTSQuery.java
  120. +26 −0 test/core/TestTSSubQuery.java
  121. +66 −5 test/core/TestTags.java
  122. +138 −1 test/core/TestTsdbQueryDownsample.java
  123. +130 −0 test/core/TestTsdbQueryQueries.java
  124. +148 −0 test/query/TestQueryUtil.java
  125. +651 −0 test/query/expression/BaseTimeSyncedIteratorTest.java
  126. +309 −0 test/query/expression/TestAbsolute.java
  127. +321 −0 test/query/expression/TestAlias.java
  128. +192 −0 test/query/expression/TestDiffSeries.java
  129. +197 −0 test/query/expression/TestDivideSeries.java
  130. +93 −0 test/query/expression/TestExpressionFactory.java
  131. +1,196 −0 test/query/expression/TestExpressionIterator.java
  132. +205 −0 test/query/expression/TestExpressionReader.java
  133. +319 −0 test/query/expression/TestExpressionTree.java
  134. +147 −0 test/query/expression/TestExpressions.java
  135. +395 −0 test/query/expression/TestHighestCurrent.java
  136. +365 −0 test/query/expression/TestHighestMax.java
  137. +813 −0 test/query/expression/TestIntersectionIterator.java
  138. +518 −0 test/query/expression/TestMovingAverage.java
  139. +196 −0 test/query/expression/TestMultiplySeries.java
  140. +304 −0 test/query/expression/TestNumericFillPolicy.java
  141. +220 −0 test/query/expression/TestPostAggregatedDataPoints.java
  142. +404 −0 test/query/expression/TestScale.java
  143. +195 −0 test/query/expression/TestSumSeries.java
  144. +504 −0 test/query/expression/TestTimeSyncedIterator.java
  145. +1,075 −0 test/query/expression/TestUnionIterator.java
  146. +104 −0 test/query/pojo/TestDownsampler.java
  147. +96 −0 test/query/pojo/TestExpression.java
  148. +99 −0 test/query/pojo/TestFilter.java
  149. +66 −0 test/query/pojo/TestJoin.java
  150. +123 −0 test/query/pojo/TestMetric.java
  151. +45 −0 test/query/pojo/TestOutput.java
  152. +223 −0 test/query/pojo/TestQuery.java
  153. +137 −0 test/query/pojo/TestTimeSpan.java
  154. +78 −9 test/storage/MockBase.java
  155. +20 −1 test/tools/TestDumpSeries.java
  156. +73 −3 test/tsd/TestHttpJsonSerializer.java
  157. +720 −0 test/tsd/TestQueryExecutor.java
  158. +118 −31 test/tsd/TestQueryRpc.java
  159. +23 −6 test/tsd/TestRpcManager.java
  160. +2 −7 test/tsd/TestSearchRpc.java
  161. +32 −0 test/tsd/TestStatsRpc.java
  162. +154 −0 test/tsd/TestUniqueIdRpc.java
  163. +313 −9 test/uid/TestUniqueId.java
  164. +165 −0 test/uid/TestUniqueIdWhitelistFilter.java
  165. +71 −0 test/utils/TestByteSet.java
  166. +506 −0 test/utils/TestDateTime.java
  167. +1 −0 third_party/alpn-boot/alpn-boot-7.0.0.v20140317.jar.md5
  168. +1 −0 third_party/alpn-boot/alpn-boot-7.1.0.v20141016.jar.md5
  169. +1 −0 third_party/alpn-boot/alpn-boot-7.1.1.v20141016.jar.md5
  170. +1 −0 third_party/alpn-boot/alpn-boot-7.1.2.v20141202.jar.md5
  171. +1 −0 third_party/alpn-boot/alpn-boot-7.1.3.v20150130.jar.md5
  172. +1 −0 third_party/alpn-boot/alpn-boot-8.0.0.v20140317.jar.md5
  173. +1 −0 third_party/alpn-boot/alpn-boot-8.1.0.v20141016.jar.md5
  174. +1 −0 third_party/alpn-boot/alpn-boot-8.1.1.v20141016.jar.md5
  175. +1 −0 third_party/alpn-boot/alpn-boot-8.1.2.v20141202.jar.md5
  176. +1 −0 third_party/alpn-boot/alpn-boot-8.1.3.v20150130.jar.md5
  177. +1 −0 third_party/alpn-boot/alpn-boot-8.1.4.v20150727.jar.md5
  178. +1 −0 third_party/alpn-boot/alpn-boot-8.1.5.v20150921.jar.md5
  179. +1 −0 third_party/alpn-boot/alpn-boot-8.1.6.v20151105.jar.md5
  180. +1 −0 third_party/alpn-boot/alpn-boot-8.1.7.v20160121.jar.md5
  181. +69 −0 third_party/alpn-boot/include.mk
  182. +1 −0 third_party/asyncbigtable/asyncbigtable-0.2.1-20151029.214823-2-jar-with-dependencies.jar.md5
  183. +1 −0 third_party/asyncbigtable/asyncbigtable-0.2.1-20160228.235952-3-jar-with-dependencies.jar.md5
  184. +23 −0 third_party/asyncbigtable/include.mk
  185. +1 −0 third_party/asynccassandra/asynccassandra-0.0.1-20151104.191228-3-jar-with-dependencies.jar.md5
  186. +1 −0 third_party/asynccassandra/asynccassandra-0.0.1-20160229.001338-4-jar-with-dependencies.jar.md5
  187. +23 −0 third_party/asynccassandra/include.mk
  188. +1 −0 third_party/gwt/gwt-dev-2.6.1.jar.md5
  189. +1 −0 third_party/gwt/gwt-user-2.6.1.jar.md5
  190. +24 −3 third_party/include.mk
  191. +23 −0 third_party/javacc/include.mk
  192. +1 −0 third_party/javacc/javacc-6.1.2.jar.md5
  193. +1 −0 third_party/jexl/commons-jexl-2.1.1.jar.md5
  194. +1 −0 third_party/jexl/commons-logging-1.1.1.jar.md5
  195. +33 −0 third_party/jexl/include.mk
  196. +23 −0 third_party/jgrapht/include.mk
  197. +1 −0 third_party/jgrapht/jgrapht-core-0.9.1.jar.md5
  198. +1 −1 third_party/zookeeper/include.mk
  199. +1 −0 third_party/zookeeper/zookeeper-3.4.6.jar.md5
  200. +36 −16 tools/check_tsd
  201. +43 −0 tools/docker/Dockerfile
  202. +16 −0 tools/docker/docker.sh
  203. +93 −0 tools/osx_full_stack_install.sh
  204. +11 −1 tsdb.in
View
@@ -38,4 +38,10 @@ guava-rpm-maker/\.project
src-main
src-test
plugin_test.jar
-/bin/
+bin/
+
+#Docker
+tools/docker/libs
+tools/docker/*.jar
+tools/docker/logback.xml
+tools/docker/opentsdb.conf
View
@@ -6,5 +6,6 @@ addons:
jdk:
- oraclejdk7
- openjdk6
+ - oraclejdk8
notifications:
email: false
View
@@ -24,5 +24,6 @@ Chris Larsen <clarsen575@gmail.com>
David Bainbridge <dbainbridge@zenoss.com>
Geoffrey Anderson <geoff@geoffreyanderson.net>
Ion Savin <comp_@gmx.net>
+Jonathan Creasy <jonathan@ghostlab.net>
Nicholas Whitehead <whitehead.nicholas@gmail.com>
Will Moss <wmoss@bu.mp>
View
@@ -68,18 +68,55 @@ tsdb_SRC := \
src/core/TSQuery.java \
src/core/TSSubQuery.java \
src/core/WritableDataPoints.java \
+ src/core/WriteableDataPointFilterPlugin.java \
src/graph/Plot.java \
src/meta/Annotation.java \
+ src/meta/MetaDataCache.java \
src/meta/TSMeta.java \
src/meta/TSUIDQuery.java \
src/meta/UIDMeta.java \
src/query/QueryUtil.java \
+ src/query/expression/Absolute.java \
+ src/query/expression/Alias.java \
+ src/query/expression/DiffSeries.java \
+ src/query/expression/DivideSeries.java \
+ src/query/expression/EDPtoDPS.java \
+ src/query/expression/Expression.java \
+ src/query/expression/ExpressionDataPoint.java \
+ src/query/expression/ExpressionFactory.java \
+ src/query/expression/ExpressionIterator.java \
+ src/query/expression/ExpressionReader.java \
+ src/query/expression/Expressions.java \
+ src/query/expression/ExpressionTree.java \
+ src/query/expression/HighestCurrent.java \
+ src/query/expression/HighestMax.java \
+ src/query/expression/IntersectionIterator.java \
+ src/query/expression/ITimeSyncedIterator.java \
+ src/query/expression/NumericFillPolicy.java \
+ src/query/expression/MovingAverage.java \
+ src/query/expression/MultiplySeries.java \
+ src/query/expression/PostAggregatedDataPoints.java \
+ src/query/expression/Scale.java \
+ src/query/expression/SumSeries.java \
+ src/query/expression/TimeShift.java \
+ src/query/expression/TimeSyncedIterator.java \
+ src/query/expression/UnionIterator.java \
+ src/query/expression/VariableIterator.java \
src/query/filter/TagVFilter.java \
src/query/filter/TagVLiteralOrFilter.java \
src/query/filter/TagVNotKeyFilter.java \
src/query/filter/TagVNotLiteralOrFilter.java \
src/query/filter/TagVRegexFilter.java \
src/query/filter/TagVWildcardFilter.java \
+ src/query/pojo/Downsampler.java \
+ src/query/pojo/Expression.java \
+ src/query/pojo/Filter.java \
+ src/query/pojo/Join.java \
+ src/query/pojo/Metric.java \
+ src/query/pojo/Output.java \
+ src/query/pojo/Query.java \
+ src/query/pojo/Timespan.java \
+ src/query/pojo/Validatable.java \
src/search/SearchPlugin.java \
src/search/SearchQuery.java \
src/search/TimeSeriesLookup.java \
@@ -96,6 +133,7 @@ tsdb_SRC := \
src/tools/MetaPurge.java \
src/tools/MetaSync.java \
src/tools/Search.java \
+ src/tools/StartupPlugin.java \
src/tools/TSDMain.java \
src/tools/TextImporter.java \
src/tools/TreeSync.java \
@@ -109,6 +147,7 @@ tsdb_SRC := \
src/tsd/AnnotationRpc.java \
src/tsd/BadRequestException.java \
src/tsd/ConnectionManager.java \
+ src/tsd/DropCachesRpc.java \
src/tsd/GnuplotException.java \
src/tsd/GraphHandler.java \
src/tsd/HttpJsonSerializer.java \
@@ -121,10 +160,12 @@ tsdb_SRC := \
src/tsd/LogsRpc.java \
src/tsd/PipelineFactory.java \
src/tsd/PutDataPointRpc.java \
+ src/tsd/QueryExecutor.java \
src/tsd/QueryRpc.java \
src/tsd/RpcHandler.java \
src/tsd/RpcPlugin.java \
src/tsd/RpcManager.java \
+ src/tsd/RpcUtil.java \
src/tsd/RTPublisher.java \
src/tsd/SearchRpc.java \
src/tsd/StaticFileRpc.java \
@@ -140,8 +181,10 @@ tsdb_SRC := \
src/uid/NoSuchUniqueName.java \
src/uid/RandomUniqueId.java \
src/uid/UniqueId.java \
+ src/uid/UniqueIdFilterPlugin.java \
src/uid/UniqueIdInterface.java \
src/utils/ByteArrayPair.java \
+ src/utils/ByteSet.java \
src/utils/Config.java \
src/utils/DateTime.java \
src/utils/Exceptions.java \
@@ -153,21 +196,47 @@ tsdb_SRC := \
src/utils/Threads.java
tsdb_DEPS = \
- $(ASYNCHBASE) \
+ $(COMMONS_LOGGING) \
$(GUAVA) \
$(LOG4J_OVER_SLF4J) \
$(LOGBACK_CLASSIC) \
$(LOGBACK_CORE) \
$(JACKSON_ANNOTATIONS) \
$(JACKSON_CORE) \
$(JACKSON_DATABIND) \
+ $(JAVACC) \
+ $(JEXL) \
+ $(JGRAPHT) \
$(NETTY) \
- $(PROTOBUF) \
$(SLF4J_API) \
$(SUASYNC) \
- $(ZOOKEEPER) \
$(APACHE_MATH)
+if BIGTABLE
+tsdb_DEPS += \
+ $(ALPN_BOOT) \
+ $(ASYNCBIGTABLE)
+maven_profile_bigtable := true
+maven_profile_hbase := false
+maven_profile_cassandra := false
+else
+if CASSANDRA
+tsdb_DEPS += \
+ $(ASYNCCASSANDRA)
+maven_profile_bigtable := false
+maven_profile_hbase := false
+maven_profile_cassandra := true
+else
+tsdb_DEPS += \
+ $(ASYNCHBASE) \
+ $(PROTOBUF) \
+ $(ZOOKEEPER)
+maven_profile_bigtable := false
+maven_profile_hbase := true
+maven_profile_cassandra := false
+endif
+endif
+
test_SRC := \
test/core/SeekableViewsForTest.java \
test/core/BaseTsdbTest.java \
@@ -190,6 +259,7 @@ test_SRC := \
test/core/TestSpanGroup.java \
test/core/TestTags.java \
test/core/TestTSDB.java \
+ test/core/TestTSDBAddPoint.java \
test/core/TestTsdbQueryDownsample.java \
test/core/TestTsdbQueryDownsampleSalted.java \
test/core/TestTsdbQuery.java \
@@ -206,12 +276,41 @@ test_SRC := \
test/meta/TestTSMeta.java \
test/meta/TestTSUIDQuery.java \
test/meta/TestUIDMeta.java \
+ test/query/expression/BaseTimeSyncedIteratorTest.java \
+ test/query/expression/TestAbsolute.java \
+ test/query/expression/TestAlias.java \
+ test/query/expression/TestDiffSeries.java \
+ test/query/expression/TestDivideSeries.java \
+ test/query/expression/TestExpressionFactory.java \
+ test/query/expression/TestExpressionIterator.java \
+ test/query/expression/TestExpressionReader.java \
+ test/query/expression/TestExpressions.java \
+ test/query/expression/TestExpressionTree.java \
+ test/query/expression/TestHighestCurrent.java \
+ test/query/expression/TestHighestMax.java \
+ test/query/expression/TestIntersectionIterator.java \
+ test/query/expression/TestNumericFillPolicy.java \
+ test/query/expression/TestMovingAverage.java \
+ test/query/expression/TestMultiplySeries.java \
+ test/query/expression/TestPostAggregatedDataPoints.java \
+ test/query/expression/TestScale.java \
+ test/query/expression/TestSumSeries.java \
+ test/query/expression/TestTimeSyncedIterator.java \
+ test/query/expression/TestUnionIterator.java \
test/query/filter/TestTagVFilter.java \
test/query/filter/TestTagVLiteralOrFilter.java \
test/query/filter/TestTagVNotKeyFilter.java \
test/query/filter/TestTagVNotLiteralOrFilter.java \
test/query/filter/TestTagVRegexFilter.java \
test/query/filter/TestTagVWildcardFilter.java \
+ test/query/pojo/TestDownsampler.java \
+ test/query/pojo/TestExpression.java \
+ test/query/pojo/TestFilter.java \
+ test/query/pojo/TestJoin.java \
+ test/query/pojo/TestMetric.java \
+ test/query/pojo/TestOutput.java \
+ test/query/pojo/TestQuery.java \
+ test/query/pojo/TestTimeSpan.java \
test/search/TestSearchPlugin.java \
test/search/TestSearchQuery.java \
test/search/TestTimeSeriesLookup.java \
@@ -237,6 +336,7 @@ test_SRC := \
test/tsd/TestHttpQuery.java \
test/tsd/TestHttpRpcPluginQuery.java \
test/tsd/TestPutRpc.java \
+ test/tsd/TestQueryExecutor.java \
test/tsd/TestQueryRpc.java \
test/tsd/TestQueryRpcLastDataPoint.java \
test/tsd/TestRpcHandler.java \
@@ -252,6 +352,7 @@ test_SRC := \
test/uid/TestRandomUniqueId.java \
test/uid/TestUniqueId.java \
test/utils/TestByteArrayPair.java \
+ test/utils/TestByteSet.java \
test/utils/TestConfig.java \
test/utils/TestDateTime.java \
test/utils/TestExceptions.java \
@@ -286,11 +387,11 @@ test_DEPS = \
$(tsdb_DEPS) \
$(JAVASSIST) \
$(JUNIT) \
- $(HAMCREST) \
+ $(HAMCREST) \
$(MOCKITO) \
- $(OBJENESIS) \
+ $(OBJENESIS) \
$(POWERMOCK_MOCKITO) \
- $(jar)
+ $(jar)
httpui_SRC := \
src/tsd/client/DateTimeBox.java \
@@ -304,12 +405,18 @@ httpui_SRC := \
httpui_DEPS = src/tsd/QueryUi.gwt.xml
+# TODO(CL) - There is likely a MUCH better way to compile and add the expression sources and jars.
+expr_grammar = $(srcdir)/src/parser.jj
+expr_package = net/opentsdb/query/expression/parser
+expr_src_dir = $(builddir)/src/$(expr_package)
+get_expr_classes = `classes=''; for f in $(packagedir)$(expr_package)/*.class; do classes="$$classes $$f"; done; echo $$classes;`
+
#dist_pkgdata_DATA = src/logback.xml
dist_static_DATA = \
src/tsd/static/favicon.ico \
src/tsd/static/opentsdb_header.jpg
-EXTRA_DIST = tsdb.in $(tsdb_SRC) $(test_SRC) \
+EXTRA_DIST = tsdb.in $(tsdb_SRC) $(test_SRC) $(expr_grammar) \
$(test_plugin_SRC) $(test_plugin_MF) $(test_plugin_SVCS:%=test/%) \
$(THIRD_PARTY) $(THIRD_PARTY:=.md5) \
$(httpui_SRC) $(httpui_DEPS) \
@@ -379,6 +486,9 @@ filter_src = \
src="$$src $$i";; \
esac; \
done; \
+ for f in $(expr_src_dir)/*.java; do \
+ src="$$src $$f"; \
+ done; \
test -n "$$src" || exit 0
# Touches all the targets if any of the dependencies are newer.
# This is useful to force-recompile all files if one of the
@@ -395,7 +505,7 @@ $(tsdb_SRC): $(tsdb_DEPS)
find_jar = test -f "$$jar" && echo "$$jar" || echo "$(srcdir)/$$jar"
get_dep_classpath = `for jar in $(tsdb_DEPS); do $(find_jar); done | tr '\n' ':'`
-.javac-stamp: $(tsdb_SRC) $(builddata_SRC)
+.javac-stamp: $(tsdb_SRC) $(builddata_SRC) runjavacc
@$(filter_src); cp=$(get_dep_classpath); \
echo "$(JAVA_COMPILE) -cp $$cp $$src"; \
$(JAVA_COMPILE) -cp $$cp $$src
@@ -611,8 +721,8 @@ manifest: .javac-stamp .git/HEAD
echo "Implementation-Version: $(git_version)"; \
echo "Implementation-Vendor: $(spec_vendor)"; } >"$@"
-$(jar): manifest .javac-stamp $(classes)
- $(JAR) cfm `basename $(jar)` manifest $(classes_with_nested_classes) \
+$(jar): manifest .javac-stamp
+ $(JAR) cfm `basename $(jar)` manifest $(classes_with_nested_classes) $(get_expr_classes) \
|| { rv=$$? && rm -f `basename $(jar)` && exit $$rv; }
# ^^^^^^^^^^^^^^^^^^^^^^^
# I've seen cases where `jar' exits with an error but leaves a partially built .jar file!
@@ -636,6 +746,9 @@ $(JAVADOC_DIR)/index.html: $(tsdb_SRC)
-link $(JDK_JAVADOC) -link $(NETTY_JAVADOC) -link $(SUASYNC_JAVADOC) \
$? $(builddata_SRC)
+runjavacc:
+ $(JAVA) -cp $(JAVACC) javacc -OUTPUT_DIRECTORY:$(expr_src_dir) $(expr_grammar); echo PWD: `pwd`;
+
dist-hook:
$(mkdir_p) $(distdir)/.git
echo $(git_version) >$(distdir)/.git/HEAD
@@ -666,6 +779,8 @@ pom.xml: pom.xml.in Makefile
echo '<!-- Generated by Makefile on '`date`' -->'; \
sed <$< \
-e 's/@ASYNCHBASE_VERSION@/$(ASYNCHBASE_VERSION)/' \
+ -e 's/@ASYNCBIGTABLE_VERSION@/$(ASYNCBIGTABLE_VERSION)/' \
+ -e 's/@ASYNCCASSANDRA_VERSION@/$(ASYNCCASSANDRA_VERSION)/' \
-e 's/@GUAVA_VERSION@/$(GUAVA_VERSION)/' \
-e 's/@GWT_VERSION@/$(GWT_VERSION)/' \
-e 's/@GWT_THEME_VERSION@/$(GWT_THEME_VERSION)/' \
@@ -684,9 +799,14 @@ pom.xml: pom.xml.in Makefile
-e 's/@SUASYNC_VERSION@/$(SUASYNC_VERSION)/' \
-e 's/@ZOOKEEPER_VERSION@/$(ZOOKEEPER_VERSION)/' \
-e 's/@APACHE_MATH_VERSION@/$(APACHE_MATH_VERSION)/' \
+ -e 's/@JEXL_VERSION@/$(JEXL_VERSION)/' \
+ -e 's/@JGRAPHT_VERSION@/$(JGRAPHT_VERSION)/' \
-e 's/@spec_title@/$(spec_title)/' \
-e 's/@spec_vendor@/$(spec_vendor)/' \
-e 's/@spec_version@/$(PACKAGE_VERSION)/' \
+ -e 's/@maven_profile_hbase@/$(maven_profile_hbase)/' \
+ -e 's/@maven_profile_bigtable@/$(maven_profile_bigtable)/' \
+ -e 's/@maven_profile_cassandrae@/$(maven_profile_cassandra)/' \
; \
} >$@-t
mv $@-t ../$@
@@ -741,7 +861,7 @@ debian: dist staticroot
cp -r gwt/queryui/* $(distdir)/debian/usr/share/opentsdb/static
`for dep_jar in $(tsdb_DEPS); do cp $$dep_jar \
$(distdir)/debian/usr/share/opentsdb/lib; done;`
- cp $(top_srcdir)/tools/* $(distdir)/debian/usr/share/opentsdb/tools
+ cp -r $(top_srcdir)/tools/* $(distdir)/debian/usr/share/opentsdb/tools
dpkg -b $(distdir)/debian $(distdir)/opentsdb-$(PACKAGE_VERSION)_all.deb
.PHONY: jar doc check gwtc gwtdev printdeps staticroot gwttsd rpm
Oops, something went wrong.

0 comments on commit cac608a

Please sign in to comment.