Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Normalize tag support #1525

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Normalize tag support #1525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cbabee9
commit just to save changes
gnydick Jan 17, 2019
2f73b5f
adding the normalize plugin and plugin config
gnydick Jan 23, 2019
e58dd54
hopefully working
gnydick Jan 23, 2019
8893ca7
added src/normalize/NormalizePlugin.java to the build system
gnydick Jan 23, 2019
c3fc2a9
fixed some normalize stuff
gnydick Jan 25, 2019
4b3e7be
updated TSDB to detect whether or not to use normalizer
gnydick Jan 25, 2019
fce4d51
fixes
gnydick Jan 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ tsdb_SRC := \
src/meta/TSMeta.java \
src/meta/TSUIDQuery.java \
src/meta/UIDMeta.java \
src/normalize/NormalizePlugin.java \
src/query/QueryUtil.java \
src/query/QueryLimitOverride.java \
src/query/expression/Absolute.java \
Expand Down Expand Up @@ -241,7 +242,7 @@ tsdb_SRC := \
src/utils/JSONException.java \
src/utils/Pair.java \
src/utils/PluginLoader.java \
src/utils/Threads.java
src/utils/Threads.java

tsdb_DEPS = \
$(ASM) \
Expand Down Expand Up @@ -428,7 +429,7 @@ test_SRC := \
test/utils/TestJSON.java \
test/utils/TestPair.java \
test/utils/TestPluginLoader.java

test_plugin_SRC := \
test/plugin/DummyPluginA.java \
test/plugin/DummyPluginB.java \
Expand All @@ -448,7 +449,7 @@ test_plugin_SVCS := \
META-INF/services/net.opentsdb.tsd.RpcPlugin \
META-INF/services/net.opentsdb.tsd.RTPublisher \
META-INF/services/net.opentsdb.tsd.StorageExceptionHandler

test_plugin_MF := \
test/META-INF/MANIFEST.MF

Expand Down Expand Up @@ -676,7 +677,7 @@ install-data-tools: $(tsdb_DEPS) $(jar)
$(INSTALL_SCRIPT) $$tools "$$destdatatoolsdir" || exit 1; \
tools="-r $(top_srcdir)/tools/*" ; \
echo " cp" $$tools "$$destdatatoolsdir" ; \
cp $$tools "$$destdatatoolsdir" || exit 1;
cp $$tools "$$destdatatoolsdir" || exit 1;

uninstall-data-tools:
@$(NORMAL_UNINSTALL)
Expand Down Expand Up @@ -746,7 +747,7 @@ uninstall-hook:
get_runtime_dep_classpath = `for jar in $(test_DEPS); do $(find_jar); done | tr '\n' ':'`
$(test_SRC): $(test_DEPS)
@$(refresh_src)

$(test_plugin_SRC): $(test_DEPS)
@$(refresh_src)

Expand Down Expand Up @@ -888,7 +889,7 @@ pom.xml: pom.xml.in Makefile
} >$@-t
mv $@-t ../$@

# Generates a maven pom called fat-jar-pom.xml that builds a fat jar
# Generates a maven pom called fat-jar-pom.xml that builds a fat jar
# containing all the dependencies required to run opentsdb
fat-jar-pom.xml: ./fat-jar/fat-jar-pom.xml.in Makefile
(cd $(top_srcdir) ; ./fat-jar/create-src-dir-overlay.sh)
Expand Down Expand Up @@ -918,7 +919,7 @@ fat-jar-pom.xml: ./fat-jar/fat-jar-pom.xml.in Makefile
-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/@JGRAPHT_VERSION@/$(JGRAPHT_VERSION)/' \
-e 's/@spec_title@/$(spec_title)/' \
-e 's/@spec_vendor@/$(spec_vendor)/' \
-e 's/@spec_version@/$(PACKAGE_VERSION)/' \
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# along with this library. If not, see <http://www.gnu.org/licenses/>.

# Semantic Versioning (see http://semver.org/).
AC_INIT([opentsdb], [2.4.0], [[email protected]])
AC_INIT([opentsdb], [2.4.0-tnp], [[email protected]])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably don't need this change.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good!

AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([foreign])

Expand Down
21 changes: 20 additions & 1 deletion pom.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,26 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
Loading